aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl12xx/wl1271_main.c
diff options
context:
space:
mode:
authorJuuso Oikarinen <juuso.oikarinen@nokia.com>2010-05-24 04:18:20 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-06-02 16:13:37 -0400
commit4fb26fa9ae043810eb99c22364d23ffc3b271b8d (patch)
treebc296f706100f561f530ef2eddc60852f5ad2501 /drivers/net/wireless/wl12xx/wl1271_main.c
parent5da54f94992b35fd58ad5b569abe8ca04048f8f1 (diff)
wl1271: Fix scan parameter handling for 5GHz
The 5GHz bands were scanned without the proper IE's in place, preventing proper 5GHz scanning. This patches fixes the problem by storing a pointer to the scan request (with the IE's) for all iterations of scan. Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com> Reviewed-by: Luciano Coelho <luciano.coelho@nokia.com> Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1271_main.c')
-rw-r--r--drivers/net/wireless/wl12xx/wl1271_main.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
index 7bf655d55152..7a14da506d78 100644
--- a/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/drivers/net/wireless/wl12xx/wl1271_main.c
@@ -1634,13 +1634,11 @@ static int wl1271_op_hw_scan(struct ieee80211_hw *hw,
1634 goto out; 1634 goto out;
1635 1635
1636 if (wl1271_11a_enabled()) 1636 if (wl1271_11a_enabled())
1637 ret = wl1271_cmd_scan(hw->priv, ssid, len, 1637 ret = wl1271_cmd_scan(hw->priv, ssid, len, req,
1638 req->ie, req->ie_len, 1, 0, 1638 1, 0, WL1271_SCAN_BAND_DUAL, 3);
1639 WL1271_SCAN_BAND_DUAL, 3);
1640 else 1639 else
1641 ret = wl1271_cmd_scan(hw->priv, ssid, len, 1640 ret = wl1271_cmd_scan(hw->priv, ssid, len, req,
1642 req->ie, req->ie_len, 1, 0, 1641 1, 0, WL1271_SCAN_BAND_2_4_GHZ, 3);
1643 WL1271_SCAN_BAND_2_4_GHZ, 3);
1644 1642
1645 wl1271_ps_elp_sleep(wl); 1643 wl1271_ps_elp_sleep(wl);
1646 1644