From: Bing Zhao Date: Sat, 4 Aug 2012 01:34:45 +0000 (-0700) Subject: UPSTREAM: mwifiex: update max_chan_per_scan correctly for SSID scan X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=f00bf280189164194af820099864966a3c5cb96c;p=cascardo%2Flinux.git UPSTREAM: mwifiex: update max_chan_per_scan correctly for SSID scan As per recent patch "658f37b mwifiex: scan less channels..." less channels are scanned per scan command in associated state. Default number of channels per scan command for normal scan are already 4, but those are 14 for SSID specific scan operation. This code change in this patch is required for SSID specific scan. Signed-off-by: Amitkumar Karwar Signed-off-by: Bing Zhao This patch has been submitted to wireless-testing.git and expected in upstream shortly. BUG=chrome-os-partner:11597 TEST=Run autotest WiFiMatFunc.090_BgScanBackoff and pass the test Change-Id: Ie5decec777e91ca28d36dbe366a7ec6c8677b434 Reviewed-on: https://gerrit.chromium.org/gerrit/29230 Reviewed-by: Sam Leffler Commit-Ready: Bing Zhao Tested-by: Bing Zhao --- diff --git a/drivers/net/wireless/mwifiex/scan.c b/drivers/net/wireless/mwifiex/scan.c index 79eaf6ac70cb..6b158708eb4e 100644 --- a/drivers/net/wireless/mwifiex/scan.c +++ b/drivers/net/wireless/mwifiex/scan.c @@ -989,6 +989,8 @@ mwifiex_config_scan(struct mwifiex_private *priv, *max_chan_per_scan = 2; else if (chan_num < MWIFIEX_LIMIT_3_CHANNELS_PER_SCAN_CMD) *max_chan_per_scan = 3; + else + *max_chan_per_scan = 4; } }