git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
ath
/
carl9170
/
tx.c
diff --git
a/drivers/net/wireless/ath/carl9170/tx.c
b/drivers/net/wireless/ath/carl9170/tx.c
index
6f41e21
..
0ef70b6
100644
(file)
--- a/
drivers/net/wireless/ath/carl9170/tx.c
+++ b/
drivers/net/wireless/ath/carl9170/tx.c
@@
-1339,7
+1339,7
@@
err_unlock_rcu:
return false;
}
return false;
}
-
int
carl9170_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
+
void
carl9170_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
{
struct ar9170 *ar = hw->priv;
struct ieee80211_tx_info *info;
{
struct ar9170 *ar = hw->priv;
struct ieee80211_tx_info *info;
@@
-1373,12
+1373,11
@@
int carl9170_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
}
carl9170_tx(ar);
}
carl9170_tx(ar);
- return
NETDEV_TX_OK
;
+ return;
err_free:
ar->tx_dropped++;
dev_kfree_skb_any(skb);
err_free:
ar->tx_dropped++;
dev_kfree_skb_any(skb);
- return NETDEV_TX_OK;
}
void carl9170_tx_scheduler(struct ar9170 *ar)
}
void carl9170_tx_scheduler(struct ar9170 *ar)