aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/scan.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-07-26 11:24:39 -0400
committerJohannes Berg <johannes.berg@intel.com>2012-10-17 05:02:09 -0400
commit55de908ab292c03f1eb280f51170ddb9c6b57e31 (patch)
treebc75bb5cea581cadf6fe8b4f121cce02d07c276a /net/mac80211/scan.c
parentfe57d9f5c0a2c1ef97ba8cdc42cfda5743f287b8 (diff)
mac80211: use channel contexts
Instead of operating on a single channel only, use the new channel context infrastructure in all mac80211 code. This enables drivers that want to use the new channel context infrastructure to use multiple channels, while nothing should change for all the other drivers that don't support it. Right now this disables both TX power settings and spatial multiplexing powersave. Both need to be re-enabled on a channel context basis. Additionally, when channel contexts are used drop the connection when channel switch is received rather than trying to handle it. This will have to be improved later. [With fixes from Eliad and Emmanuel incorporated] Signed-off-by: Eliad Peller <eliad@wizery.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/scan.c')
-rw-r--r--net/mac80211/scan.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index fdaa505dab45..987c75d46bc0 100644
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -421,7 +421,7 @@ static void ieee80211_scan_state_send_probe(struct ieee80211_local *local,
421 local->scan_req->ie, local->scan_req->ie_len, 421 local->scan_req->ie, local->scan_req->ie_len,
422 local->scan_req->rates[band], false, 422 local->scan_req->rates[band], false,
423 local->scan_req->no_cck, 423 local->scan_req->no_cck,
424 local->hw.conf.channel); 424 local->hw.conf.channel, true);
425 425
426 /* 426 /*
427 * After sending probe requests, wait for probe responses 427 * After sending probe requests, wait for probe responses
@@ -484,7 +484,7 @@ static int __ieee80211_start_scan(struct ieee80211_sub_if_data *sdata,
484 if (local->ops->hw_scan) { 484 if (local->ops->hw_scan) {
485 __set_bit(SCAN_HW_SCANNING, &local->scanning); 485 __set_bit(SCAN_HW_SCANNING, &local->scanning);
486 } else if ((req->n_channels == 1) && 486 } else if ((req->n_channels == 1) &&
487 (req->channels[0] == local->oper_channel)) { 487 (req->channels[0] == local->_oper_channel)) {
488 /* 488 /*
489 * If we are scanning only on the operating channel 489 * If we are scanning only on the operating channel
490 * then we do not need to stop normal activities 490 * then we do not need to stop normal activities