Thread (5 messages) 5 messages, 3 authors, 2011-02-26
STALE5588d

[PATCH v2] at76c50x-usb: fix warning caused by at76_mac80211_tx now returning void

From: John W. Linville <hidden>
Date: 2011-02-25 22:13:26
Subsystem: networking drivers (wireless), the rest · Maintainers: Johannes Berg, Linus Torvalds

  CC [M]  drivers/net/wireless/at76c50x-usb.o
drivers/net/wireless/at76c50x-usb.c: In function ‘at76_mac80211_tx’:
drivers/net/wireless/at76c50x-usb.c:1759:4: warning: ‘return’ with a value, in function returning void

This is fallout from commit 7bb4568372856688bc070917265bce0b88bb7d4d
("mac80211: make tx() operation return void").

Signed-off-by: John W. Linville <redacted>
---
v2 drop the frame and return...duh!

Will this hack still work if we drop the frame?  Did it ever work?

 drivers/net/wireless/at76c50x-usb.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
index 10b4393..2986014 100644
--- a/drivers/net/wireless/at76c50x-usb.c
+++ b/drivers/net/wireless/at76c50x-usb.c
@@ -1756,7 +1756,8 @@ static void at76_mac80211_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
 		if (compare_ether_addr(priv->bssid, mgmt->bssid)) {
 			memcpy(priv->bssid, mgmt->bssid, ETH_ALEN);
 			ieee80211_queue_work(hw, &priv->work_join_bssid);
-			return NETDEV_TX_BUSY;
+			dev_kfree_skb_any(skb);
+			return;
 		}
 	}
 
-- 
1.7.4
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help