Commit 9b864870 authored by Johannes Berg's avatar Johannes Berg

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: default avatarJohannes Berg <johannes.berg@intel.com>
parent 4797c7ba
...@@ -479,11 +479,10 @@ static int __ieee80211_start_scan(struct ieee80211_sub_if_data *sdata, ...@@ -479,11 +479,10 @@ static int __ieee80211_start_scan(struct ieee80211_sub_if_data *sdata,
if (local->ops->hw_scan) { if (local->ops->hw_scan) {
__set_bit(SCAN_HW_SCANNING, &local->scanning); __set_bit(SCAN_HW_SCANNING, &local->scanning);
} else if ((req->n_channels == 1) && } else if ((req->n_channels == 1) &&
(req->channels[0]->center_freq == (req->channels[0] == local->oper_channel)) {
local->hw.conf.channel->center_freq)) { /*
* If we are scanning only on the operating channel
/* If we are scanning only on the current channel, then * then we do not need to stop normal activities
* we do not need to stop normal activities
*/ */
unsigned long next_delay; unsigned long next_delay;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment