From e53e95901bc0a8e222ed62784420943811cf0fdc Mon Sep 17 00:00:00 2001 From: Amitkumar Karwar Date: Fri, 19 Oct 2012 19:19:18 -0700 Subject: [PATCH] --- yaml --- r: 340991 b: refs/heads/master c: f3e1af3e18004aca12771dfb0b04e04497190c99 h: refs/heads/master i: 340989: 7985ccc4a950b33982568d1cac59525fd0c50132 340987: edb8bd7a72b2cac0a4c7038534476c31bfdcad26 340983: 65ca5285a907aba977da463989463ba3082c0379 340975: c6dda4f01e8b9d03897f44de362e1a52728c0817 340959: dbae93baa91be957cd029670af6e2d857020b509 340927: 6a2e4a19504879215756c3d82dd543cbecf49217 340863: 455e05b73ba27275947deeeed82b8c10884685de 340735: 279f3d13a6cc16123497dce204ce9f2fa7f11de4 340479: 95482354bc39224f918430dc6275cf4b7bd3df58 339967: a59e057f8634dc03245ef391cd8791eb8efe6db4 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/mwifiex/scan.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 75a3fdcdae02..1a35edb0f7d0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b0e70c2fb67bc376c3114a709ce0852e71d37ecb +refs/heads/master: f3e1af3e18004aca12771dfb0b04e04497190c99 diff --git a/trunk/drivers/net/wireless/mwifiex/scan.c b/trunk/drivers/net/wireless/mwifiex/scan.c index 9c0ad0fe276a..13a80cb789af 100644 --- a/trunk/drivers/net/wireless/mwifiex/scan.c +++ b/trunk/drivers/net/wireless/mwifiex/scan.c @@ -941,6 +941,11 @@ mwifiex_config_scan(struct mwifiex_private *priv, chan_idx)->chan_scan_mode_bitmap &= ~MWIFIEX_PASSIVE_SCAN; + if (*filtered_scan) + (scan_chan_list + + chan_idx)->chan_scan_mode_bitmap + |= MWIFIEX_DISABLE_CHAN_FILT; + if (user_scan_in->chan_list[chan_idx].scan_time) { scan_dur = (u16) user_scan_in-> chan_list[chan_idx].scan_time;