diff options
author | Antonio Quartulli <ordex@autistici.org> | 2012-10-16 02:39:22 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2012-10-18 11:21:22 -0400 |
commit | 5c95b940bd97e744267249e3b0780e6ef04b029c (patch) | |
tree | a781656df4682ebd39669fea9ea11d28adef55e2 /net/mac80211/main.c | |
parent | 4ee3e063f10acf6fd17c0ee6f1d0a95726e74cb2 (diff) |
nl/cfg80211: force scan using an AP vif if requested
If the user wants to scan using a vif configured as AP,
cfg80211 must give him a chance to do it, even if this
will disrupt the stations performance due to off-channel
scanning. To do so, this patch adds a 'force' flag to the
SCAN_TRIGGER command which tells cfg80211 to perform the
scanning operation even if the vif is an AP and the
beaconing has already started.
Signed-off-by: Antonio Quartulli <ordex@autistici.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/main.c')
-rw-r--r-- | net/mac80211/main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index ba5a23249771..c42094be2f0b 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c | |||
@@ -603,7 +603,9 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len, | |||
603 | NL80211_FEATURE_HT_IBSS; | 603 | NL80211_FEATURE_HT_IBSS; |
604 | 604 | ||
605 | if (!ops->hw_scan) | 605 | if (!ops->hw_scan) |
606 | wiphy->features |= NL80211_FEATURE_LOW_PRIORITY_SCAN; | 606 | wiphy->features |= NL80211_FEATURE_LOW_PRIORITY_SCAN | |
607 | NL80211_FEATURE_AP_SCAN; | ||
608 | |||
607 | 609 | ||
608 | if (!ops->set_key) | 610 | if (!ops->set_key) |
609 | wiphy->flags |= WIPHY_FLAG_IBSS_RSN; | 611 | wiphy->flags |= WIPHY_FLAG_IBSS_RSN; |