* [PATCH] at76c50x-usb: fix warning caused by at76_mac80211_tx now returning void
@ 2011-02-25 20:40 John W. Linville
2011-02-25 20:47 ` Johannes Berg
0 siblings, 1 reply; 5+ messages in thread
From: John W. Linville @ 2011-02-25 20:40 UTC (permalink / raw)
To: linux-wireless; +Cc: John W. Linville
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 | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
index 10b4393..a37c93b 100644
--- a/drivers/net/wireless/at76c50x-usb.c
+++ b/drivers/net/wireless/at76c50x-usb.c
@@ -1756,7 +1756,6 @@ 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;
}
}
--
1.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] at76c50x-usb: fix warning caused by at76_mac80211_tx now returning void
2011-02-25 20:40 [PATCH] at76c50x-usb: fix warning caused by at76_mac80211_tx now returning void John W. Linville
@ 2011-02-25 20:47 ` Johannes Berg
2011-02-25 22:03 ` [PATCH v2] " John W. Linville
0 siblings, 1 reply; 5+ messages in thread
From: Johannes Berg @ 2011-02-25 20:47 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-wireless
On Fri, 2011-02-25 at 15:40 -0500, John W. Linville wrote:
> 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 | 1 -
> 1 files changed, 0 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
> index 10b4393..a37c93b 100644
> --- a/drivers/net/wireless/at76c50x-usb.c
> +++ b/drivers/net/wireless/at76c50x-usb.c
> @@ -1756,7 +1756,6 @@ 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;
I guess I missed this one -- bit it needs to free the SKB otherwise it
probably leaks.
johannes
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2] at76c50x-usb: fix warning caused by at76_mac80211_tx now returning void
2011-02-25 20:47 ` Johannes Berg
@ 2011-02-25 22:03 ` John W. Linville
2011-02-26 9:21 ` Johannes Berg
0 siblings, 1 reply; 5+ messages in thread
From: John W. Linville @ 2011-02-25 22:03 UTC (permalink / raw)
To: linux-wireless; +Cc: johannes, kalle.valo, kvalo, John W. Linville
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>
---
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2] at76c50x-usb: fix warning caused by at76_mac80211_tx now returning void
2011-02-25 22:03 ` [PATCH v2] " John W. Linville
@ 2011-02-26 9:21 ` Johannes Berg
2011-02-26 10:17 ` Kalle Valo
0 siblings, 1 reply; 5+ messages in thread
From: Johannes Berg @ 2011-02-26 9:21 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-wireless, kalle.valo, kvalo
On Fri, 2011-02-25 at 17:03 -0500, John W. Linville wrote:
> 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>
> ---
> v2 drop the frame and return...duh!
>
> Will this hack still work if we drop the frame? Did it ever work?
I'm not sure it ever worked, Kalle did mention that this driver never
really worked well.
johannes
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] at76c50x-usb: fix warning caused by at76_mac80211_tx now returning void
2011-02-26 9:21 ` Johannes Berg
@ 2011-02-26 10:17 ` Kalle Valo
0 siblings, 0 replies; 5+ messages in thread
From: Kalle Valo @ 2011-02-26 10:17 UTC (permalink / raw)
To: Johannes Berg; +Cc: John W. Linville, linux-wireless
Johannes Berg <johannes@sipsolutions.net> writes:
>> v2 drop the frame and return...duh!
>>
>> Will this hack still work if we drop the frame? Did it ever work?
>
> I'm not sure it ever worked, Kalle did mention that this driver never
> really worked well.
The driver did work until mac80211 stopped providing ssid. The
firmware really needs the ssid before assocation, or at least I
haven't a way to workaround that.
I'm thinking of removing the driver altogether, as it's obvious that I
don't have time to work on it. If someone wants to volunteer to fix
it, now is the perfect time to do it :)
--
Kalle Valo
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-02-26 10:17 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-25 20:40 [PATCH] at76c50x-usb: fix warning caused by at76_mac80211_tx now returning void John W. Linville
2011-02-25 20:47 ` Johannes Berg
2011-02-25 22:03 ` [PATCH v2] " John W. Linville
2011-02-26 9:21 ` Johannes Berg
2011-02-26 10:17 ` Kalle Valo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox