diff options
| author | Benoit Papillault <benoit.papillault@free.fr> | 2010-01-14 23:20:31 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-01-15 22:58:28 +0100 |
| commit | 93895757df4ebe22c98b9128b98ebf8cec972c60 (patch) | |
| tree | 8603e3147d14ec9b52ba7f75ff1b13c099aed1b7 /net | |
| parent | Staging: r8187se: Fix compile error from wireless-testing commit 7044cc56 (diff) | |
| download | linux-93895757df4ebe22c98b9128b98ebf8cec972c60.tar.xz linux-93895757df4ebe22c98b9128b98ebf8cec972c60.zip | |
mac80211: Fixed netif_tx_wake_all_queues in IBSS mode
When ieee80211_offchannel_return is called, it needs to re-enabled TX
queues that have been stopped in ieee80211_offchannel_stop_beaconing or
ieee80211_offchannel_stop_station. It happens if we are doing a scan with an
IBSS interface. In this case, the interface stopped transmitting.
Signed-off-by: Benoit Papillault <benoit.papillault@free.fr>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/offchannel.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/mac80211/offchannel.c b/net/mac80211/offchannel.c index 1facfeb1f79b..c36b1911987a 100644 --- a/net/mac80211/offchannel.c +++ b/net/mac80211/offchannel.c @@ -153,9 +153,11 @@ void ieee80211_offchannel_return(struct ieee80211_local *local, if (sdata->vif.type == NL80211_IFTYPE_STATION) { if (sdata->u.mgd.associated) ieee80211_offchannel_ps_disable(sdata); - netif_tx_wake_all_queues(sdata->dev); } + if (sdata->vif.type != NL80211_IFTYPE_MONITOR) + netif_tx_wake_all_queues(sdata->dev); + /* re-enable beaconing */ if (enable_beaconing && (sdata->vif.type == NL80211_IFTYPE_AP || |