---

yaml --- r: 183658 b: refs/heads/master c: 9389575 h: refs/heads/master v: v3
git-mirror · Jan 15, 2010 · 11a49ff · 11a49ff
1 parent 1d6daed
commit 11a49ff
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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 ||