From: Johannes Berg Date: Thu, 26 Jul 2012 12:38:32 +0000 (+0200) Subject: mac80211: check operating channel in scan X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9b8648704358e42f9865cd6de7cedb5ac0db67e7;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git 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 --- diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c index bcaee5d1283..4b75ddeef6b 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;