aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/iface.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-02-06 17:57:57 -0500
committerJohannes Berg <johannes.berg@intel.com>2013-02-11 12:45:01 -0500
commitf1e3e0515646dd0f4c783c1c39839d2706501344 (patch)
tree99705c7a8991863624415ac96fdf27f773fbc224 /net/mac80211/iface.c
parent09b85568c142fc1c776dea86a24fcb05f0eeb48b (diff)
mac80211: remove IEEE80211_HW_SCAN_WHILE_IDLE
There are only a few drivers that use HW scan, and all of those don't need a non-idle transition before starting the scan -- some don't even care about idle at all. Remove the flag and code associated with it. The only driver that really actually needed this is wl1251 and it can just do it itself in the hw_scan callback -- implement that. Acked-by: Luciano Coelho <coelho@ti.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/iface.c')
-rw-r--r--net/mac80211/iface.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index deb78e864af6..3ece8eb6d2df 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -151,12 +151,8 @@ static u32 __ieee80211_recalc_idle(struct ieee80211_local *local)
151 } 151 }
152 } 152 }
153 153
154 sdata = rcu_dereference_protected(local->scan_sdata, 154 scanning = test_bit(SCAN_SW_SCANNING, &local->scanning) ||
155 lockdep_is_held(&local->mtx)); 155 test_bit(SCAN_ONCHANNEL_SCANNING, &local->scanning);
156 if (sdata && !(local->hw.flags & IEEE80211_HW_SCAN_WHILE_IDLE)) {
157 scanning = true;
158 sdata->vif.bss_conf.idle = false;
159 }
160 156
161 list_for_each_entry(sdata, &local->interfaces, list) { 157 list_for_each_entry(sdata, &local->interfaces, list) {
162 if (sdata->vif.type == NL80211_IFTYPE_MONITOR || 158 if (sdata->vif.type == NL80211_IFTYPE_MONITOR ||