UPSTREAM?: mwifiex: shorten per channel scan time

Currently the scan time per channel for active scanning is set to
200ms. It takes quite a while to finsh scanning on all channels,
especially with a dual band configuration.

Change the per channel scan time settings to the following values:

passive scan: 110ms
active scan: 30ms
specific scan: 30ms

Above settings have been tested on x86 and arm platforms.

Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
BUG=chrome-os-partner:8707
TEST=ping+scan test

Change-Id: Ib85bf163378268b9453cb329ccae603bfb70eeaa
Reviewed-on: https://gerrit-int.chromium.org/19350
Commit-Ready: Sam Leffler <sleffler@google.com>
Reviewed-by: Sam Leffler <sleffler@google.com>
Tested-by: Sam Leffler <sleffler@google.com>

diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h
index 7411b7d..0692d0a 100644 (file)
--- a/drivers/net/wireless/mwifiex/main.h
+++ b/drivers/net/wireless/mwifiex/main.h
@@ -79,9 +79,9 @@ enum {
 
 #define SCAN_BEACON_ENTRY_PAD                  6
 
-#define MWIFIEX_PASSIVE_SCAN_CHAN_TIME 200
-#define MWIFIEX_ACTIVE_SCAN_CHAN_TIME  200
-#define MWIFIEX_SPECIFIC_SCAN_CHAN_TIME        110
+#define MWIFIEX_PASSIVE_SCAN_CHAN_TIME 110
+#define MWIFIEX_ACTIVE_SCAN_CHAN_TIME  30
+#define MWIFIEX_SPECIFIC_SCAN_CHAN_TIME        30
 
 #define SCAN_RSSI(RSSI)                                        (0x100 - ((u8)(RSSI)))