mwifiex: remove redundant scan operation
authorAmitkumar Karwar <akarwar@marvell.com>
Sat, 25 Feb 2012 05:35:36 +0000 (21:35 -0800)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 29 Feb 2012 19:11:35 +0000 (14:11 -0500)
It should have been removed by commit "mwifiex: use cfg80211 dynamic
scan..." (7c6fa2a843..) after adding code to avoid an extra scan
during association because scan entries are valid for 15 seconds in
cfg80211 stack.

Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/mwifiex/cfg80211.c

index 8d8ee639fe5607ccab8502678bc0f68598cbd85d..a08037e85101074fda5e89ff8807765b94841be0 100644 (file)
@@ -923,12 +923,6 @@ mwifiex_cfg80211_assoc(struct mwifiex_private *priv, size_t ssid_len, u8 *ssid,
                }
        }
 done:
-       /* Do specific SSID scanning */
-       if (mwifiex_request_scan(priv, &req_ssid)) {
-               dev_err(priv->adapter->dev, "scan error\n");
-               return -EFAULT;
-       }
-
        /*
         * Scan entries are valid for some time (15 sec). So we can save one
         * active scan time if we just try cfg80211_get_bss first. If it fails