diff options
author | John W. Linville <linville@tuxdriver.com> | 2012-02-29 20:53:21 +0100 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-02-29 20:53:21 +0100 |
commit | 8701ff0a88bcfc8c7dced3842919ad8d016a6835 (patch) | |
tree | ba71774b83e92d6507a398024a6d89b146181320 /net/mac80211/iface.c | |
parent | ath9k: decouple RX error checking for DFS (diff) | |
parent | mwifiex: reset encryption mode flag before association (diff) | |
download | linux-8701ff0a88bcfc8c7dced3842919ad8d016a6835.tar.xz linux-8701ff0a88bcfc8c7dced3842919ad8d016a6835.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'net/mac80211/iface.c')
-rw-r--r-- | net/mac80211/iface.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 60b240ce709e..620ca8d2ad42 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -1344,6 +1344,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)) |