aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl12xx/wl1251_main.c
diff options
context:
space:
mode:
authorKalle Valo <kalle.valo@nokia.com>2010-01-05 20:17:03 +0200
committerJohn W. Linville <linville@tuxdriver.com>2010-01-12 13:51:26 -0500
commitdc52f0a8e50303eb67ff8856cd8d1b461462ceec (patch)
tree6f71ce1a4ac471fe6803a5482a4e58817ad27b9c /drivers/net/wireless/wl12xx/wl1251_main.c
parentwl1251: get probe request template from mac80211 (diff)
downloadlinux-dev-dc52f0a8e50303eb67ff8856cd8d1b461462ceec.tar.xz
linux-dev-dc52f0a8e50303eb67ff8856cd8d1b461462ceec.zip
wl1251: use mac80211 provided channel parameters in scanning
The number of channels to be used in scan was hard coded in wl1251. The proper way is to use the channels array provided by mac80211. Signed-off-by: Kalle Valo <kalle.valo@nokia.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to '')
-rw-r--r--drivers/net/wireless/wl12xx/wl1251_main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1251_main.c b/drivers/net/wireless/wl12xx/wl1251_main.c
index 1db97229af47..4728983b4383 100644
--- a/drivers/net/wireless/wl12xx/wl1251_main.c
+++ b/drivers/net/wireless/wl12xx/wl1251_main.c
@@ -878,7 +878,8 @@ static int wl1251_op_hw_scan(struct ieee80211_hw *hw,
wl->scanning = true;
- ret = wl1251_cmd_scan(wl, ssid, ssid_len, 13, 3);
+ ret = wl1251_cmd_scan(wl, ssid, ssid_len, req->channels,
+ req->n_channels, WL1251_SCAN_NUM_PROBES);
if (ret < 0) {
wl->scanning = false;
goto out_sleep;