at76c50x-usb: fix warning caused by at76_mac80211_tx now returning void
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 25 Feb 2011 20:38:09 +0000 (15:38 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 28 Feb 2011 18:57:30 +0000 (13:57 -0500)
  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>
drivers/net/wireless/at76c50x-usb.c

index 10b4393d7fe09addcc30e259269ef1fc1b6b2a75..298601436ee2631e2eaa8afc9b3f3989ea459e0b 100644 (file)
@@ -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;
                }
        }