From 4fa25a5da1ea7c0297ea37cee48b923ca0849f90 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sat, 23 Feb 2013 18:40:57 +0100 Subject: [PATCH] --- yaml --- r: 360799 b: refs/heads/master c: b759f4ddcafb6414056cf3e49f2ab12359101c2e h: refs/heads/master i: 360797: d6f974e405153bd81623b1cb85ccd2b1273153f7 360795: 95dd1035e0a09cd416332b0c5c0aaf33e211c47c 360791: c0c91d4adc335aef443179aa785af0928453e297 360783: 159e91fd1e3472ae3396b70942422621b2930336 360767: cd9e66b0d46e0deb1948735989bf188bbdf7fd63 v: v3 --- [refs] | 2 +- trunk/net/mac80211/iface.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b0e6fcc70348..7a97414892fc 100644 --- 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 index 2c059e54e885..640afab304d7 100644 --- 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) {