summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/at76c50x-usb.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2011-02-25 21:38:09 +0100
committerJohn W. Linville <linville@tuxdriver.com>2011-02-28 19:57:30 +0100
commit10889f1330660fd73dc38aadbff7c930fbc4fe20 (patch)
treeb1896663f018440bfd54f316a79c8a287c0fbf60 /drivers/net/wireless/at76c50x-usb.c
parentiwlegacy: change some symbols duplicated from iwlwifi directory (diff)
downloadlinux-10889f1330660fd73dc38aadbff7c930fbc4fe20.tar.xz
linux-10889f1330660fd73dc38aadbff7c930fbc4fe20.zip
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>
Diffstat (limited to 'drivers/net/wireless/at76c50x-usb.c')
-rw-r--r--drivers/net/wireless/at76c50x-usb.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
index 10b4393d7fe0..298601436ee2 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;
}
}