From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 25 Feb 2011 20:38:09 +0000 (-0500)
Subject: at76c50x-usb: fix warning caused by at76_mac80211_tx now returning void
X-Git-Tag: v3.0~349^2~16^2~578^2~99
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=10889f1330660fd73dc38aadbff7c930fbc4fe20;p=platform%2Fkernel%2Flinux-amlogic.git

at76c50x-usb: fix warning caused by at76_mac80211_tx now returning void

  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 <linville@tuxdriver.com>
---

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;
 		}
 	}