diff options
| author | Amitkumar Karwar <akarwar@marvell.com> | 2012-02-25 09:35:36 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-02-29 23:11:35 +0400 |
| commit | 1a907b749c0ae235ab46e3ba7834e6c143f5503e (patch) | |
| tree | 6991567cba87699f60e53db57ae2096170640e3f /drivers/net | |
| parent | 37ad38887d9ca5ed66c6f2b14a8921794bf3d4c3 (diff) | |
| download | linux-1a907b749c0ae235ab46e3ba7834e6c143f5503e.tar.xz | |
mwifiex: remove redundant scan operation
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>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/mwifiex/cfg80211.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c index 8d8ee639fe56..a08037e85101 100644 --- a/drivers/net/wireless/mwifiex/cfg80211.c +++ b/drivers/net/wireless/mwifiex/cfg80211.c @@ -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 |