aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl12xx/wl1251_cmd.c
diff options
context:
space:
mode:
authorKalle Valo <kalle.valo@nokia.com>2010-01-05 13:17:03 -0500
committerJohn W. Linville <linville@tuxdriver.com>2010-01-12 13:51:26 -0500
commitdc52f0a8e50303eb67ff8856cd8d1b461462ceec (patch)
tree6f71ce1a4ac471fe6803a5482a4e58817ad27b9c /drivers/net/wireless/wl12xx/wl1251_cmd.c
parente477c56e852c4c6db1f7665c642c9f45f76616a9 (diff)
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 'drivers/net/wireless/wl12xx/wl1251_cmd.c')
-rw-r--r--drivers/net/wireless/wl12xx/wl1251_cmd.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1251_cmd.c b/drivers/net/wireless/wl12xx/wl1251_cmd.c
index fcbfbd7585f..0320b478bb3 100644
--- a/drivers/net/wireless/wl12xx/wl1251_cmd.c
+++ b/drivers/net/wireless/wl12xx/wl1251_cmd.c
@@ -412,6 +412,7 @@ out:
412} 412}
413 413
414int wl1251_cmd_scan(struct wl1251 *wl, u8 *ssid, size_t ssid_len, 414int wl1251_cmd_scan(struct wl1251 *wl, u8 *ssid, size_t ssid_len,
415 struct ieee80211_channel *channels[],
415 unsigned int n_channels, unsigned int n_probes) 416 unsigned int n_channels, unsigned int n_probes)
416{ 417{
417 struct wl1251_cmd_scan *cmd; 418 struct wl1251_cmd_scan *cmd;
@@ -442,7 +443,7 @@ int wl1251_cmd_scan(struct wl1251 *wl, u8 *ssid, size_t ssid_len,
442 memset(&cmd->channels[i].bssid_msb, 0xff, 2); 443 memset(&cmd->channels[i].bssid_msb, 0xff, 2);
443 cmd->channels[i].early_termination = 0; 444 cmd->channels[i].early_termination = 0;
444 cmd->channels[i].tx_power_att = 0; 445 cmd->channels[i].tx_power_att = 0;
445 cmd->channels[i].channel = i + 1; 446 cmd->channels[i].channel = channels[i]->hw_value;
446 } 447 }
447 448
448 cmd->params.ssid_len = ssid_len; 449 cmd->params.ssid_len = ssid_len;