From 11a49ff85c9e993e3e87805725541f769c187fa3 Mon Sep 17 00:00:00 2001 From: Benoit Papillault Date: Thu, 14 Jan 2010 23:20:31 +0100 Subject: [PATCH] --- yaml --- r: 183658 b: refs/heads/master c: 93895757df4ebe22c98b9128b98ebf8cec972c60 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/mac80211/offchannel.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c06931ddc056..389e7b3171d0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b6b1ac69372da996f40863358df41ca77075b249 +refs/heads/master: 93895757df4ebe22c98b9128b98ebf8cec972c60 diff --git a/trunk/net/mac80211/offchannel.c b/trunk/net/mac80211/offchannel.c index 1facfeb1f79b..c36b1911987a 100644 --- a/trunk/net/mac80211/offchannel.c +++ b/trunk/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 ||