summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-07-26 14:38:32 +0200
committerJohannes Berg <johannes.berg@intel.com>2012-08-20 14:13:43 +0200
commit9b8648704358e42f9865cd6de7cedb5ac0db67e7 (patch)
tree28cd1d6816bc7f3a779ab5690d7a0682f4a9f520
parent4797c7ba93e4049cdda18045c01bbe563aafff69 (diff)
downloadlinux-9b8648704358e42f9865cd6de7cedb5ac0db67e7.tar.bz2
mac80211: check operating channel in scan
The optimisation of scanning only on the current channel should check the operating channel. Also modify it to compare channel pointer rather than the frequency. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r--net/mac80211/scan.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index bcaee5d12839..4b75ddeef6b1 100644
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -479,11 +479,10 @@ static int __ieee80211_start_scan(struct ieee80211_sub_if_data *sdata,
if (local->ops->hw_scan) {
__set_bit(SCAN_HW_SCANNING, &local->scanning);
} else if ((req->n_channels == 1) &&
- (req->channels[0]->center_freq ==
- local->hw.conf.channel->center_freq)) {
-
- /* If we are scanning only on the current channel, then
- * we do not need to stop normal activities
+ (req->channels[0] == local->oper_channel)) {
+ /*
+ * If we are scanning only on the operating channel
+ * then we do not need to stop normal activities
*/
unsigned long next_delay;