aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/main.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/main.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/main.c')
-rw-r--r--net/mac80211/main.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 2220331f4b7c..38b3468bc515 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -696,9 +696,6 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
696 return -EINVAL; 696 return -EINVAL;
697#endif 697#endif
698 698
699 if ((hw->flags & IEEE80211_HW_SCAN_WHILE_IDLE) && !local->ops->hw_scan)
700 return -EINVAL;
701
702 if (!local->use_chanctx) { 699 if (!local->use_chanctx) {
703 for (i = 0; i < local->hw.wiphy->n_iface_combinations; i++) { 700 for (i = 0; i < local->hw.wiphy->n_iface_combinations; i++) {
704 const struct ieee80211_iface_combination *comb; 701 const struct ieee80211_iface_combination *comb;