diff options
author | Johannes Berg <johannes.berg@intel.com> | 2011-02-24 08:42:06 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-02-25 15:32:34 -0500 |
commit | 7bb4568372856688bc070917265bce0b88bb7d4d (patch) | |
tree | e3ca3e7d233944bbc271c650c8b037c3a6652d98 /drivers/net/wireless/libertas_tf | |
parent | 43f12d47f0580e04e26c14c03cb19cea9687854e (diff) |
mac80211: make tx() operation return void
The return value of the tx operation is commonly
misused by drivers, leading to errors. All drivers
will drop frames if they fail to TX the frame, and
they must also properly manage the queues (if they
didn't, mac80211 would already warn).
Removing the ability for drivers to return a BUSY
value also allows significant cleanups of the TX
TX handling code in mac80211.
Note that this also fixes a bug in ath9k_htc, the
old "return -1" there was wrong.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Tested-by: Sedat Dilek <sedat.dilek@googlemail.com> [ath5k]
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com> [rt2x00]
Acked-by: Larry Finger <Larry.Finger@lwfinger.net> [b43, rtl8187, rtlwifi]
Acked-by: Luciano Coelho <coelho@ti.com> [wl12xx]
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas_tf')
-rw-r--r-- | drivers/net/wireless/libertas_tf/main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/libertas_tf/main.c b/drivers/net/wireless/libertas_tf/main.c index 9278b3c8ee30..d4005081f1df 100644 --- a/drivers/net/wireless/libertas_tf/main.c +++ b/drivers/net/wireless/libertas_tf/main.c | |||
@@ -225,7 +225,7 @@ static void lbtf_free_adapter(struct lbtf_private *priv) | |||
225 | lbtf_deb_leave(LBTF_DEB_MAIN); | 225 | lbtf_deb_leave(LBTF_DEB_MAIN); |
226 | } | 226 | } |
227 | 227 | ||
228 | static int lbtf_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb) | 228 | static void lbtf_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb) |
229 | { | 229 | { |
230 | struct lbtf_private *priv = hw->priv; | 230 | struct lbtf_private *priv = hw->priv; |
231 | 231 | ||
@@ -236,7 +236,6 @@ static int lbtf_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb) | |||
236 | * there are no buffered multicast frames to send | 236 | * there are no buffered multicast frames to send |
237 | */ | 237 | */ |
238 | ieee80211_stop_queues(priv->hw); | 238 | ieee80211_stop_queues(priv->hw); |
239 | return NETDEV_TX_OK; | ||
240 | } | 239 | } |
241 | 240 | ||
242 | static void lbtf_tx_work(struct work_struct *work) | 241 | static void lbtf_tx_work(struct work_struct *work) |