---

yaml --- r: 288210 b: refs/heads/master c: 0dee006 h: refs/heads/master v: v3
git-mirror · Feb 21, 2012 · 6447eda · 6447eda
1 parent c490c3b
commit 6447eda
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8617b093d0031837a7be9b32bc674580cfb5f6b5
+refs/heads/master: 0dee00686da88cc32753e02e4e8efdd9e326e4d2
diff --git a/trunk/net/mac80211/iface.c b/trunk/net/mac80211/iface.c
@@ -1332,6 +1332,9 @@ u32 __ieee80211_recalc_idle(struct ieee80211_local *local)
 		hw_roc = true;
 
 	list_for_each_entry(sdata, &local->interfaces, list) {
+		if (sdata->vif.type == NL80211_IFTYPE_MONITOR ||
+		    sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
+			continue;
 		if (sdata->old_idle == sdata->vif.bss_conf.idle)
 			continue;
 		if (!ieee80211_sdata_running(sdata))