---

yaml --- r: 360799 b: refs/heads/master c: b759f4d h: refs/heads/master i: 360797: d6f974e 360795: 95dd103 360791: c0c91d4 360783: 159e91f 360767: cd9e66b v: v3
git-mirror · Feb 26, 2013 · 4fa25a5 · 4fa25a5
1 parent dfa022c
commit 4fa25a5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a7679ed5a0e92c87eeef33ae463e39a843561836
+refs/heads/master: b759f4ddcafb6414056cf3e49f2ab12359101c2e
diff --git a/trunk/net/mac80211/iface.c b/trunk/net/mac80211/iface.c
@@ -107,7 +107,7 @@ void ieee80211_recalc_idle(struct ieee80211_local *local)
 
 	lockdep_assert_held(&local->mtx);
 
-	active = !list_empty(&local->chanctx_list);
+	active = !list_empty(&local->chanctx_list) || local->monitors;
 
 	if (!local->ops->remain_on_channel) {
 		list_for_each_entry(roc, &local->roc_list, list) {