diff options
author | Yuri Kululin <ext-yuri.kululin@nokia.com> | 2010-08-13 13:46:12 +0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-08-13 13:46:19 -0400 |
commit | fe0dbcc9d2e941328b3269dab102b94ad697ade5 (patch) | |
tree | 54a0e4682f4145593474ae7b0fd45276dcbb0a8d | |
parent | 71ba186c123630ddab17667ec9ecf7e2ef211295 (diff) | |
download | linux-3.10-fe0dbcc9d2e941328b3269dab102b94ad697ade5.tar.gz linux-3.10-fe0dbcc9d2e941328b3269dab102b94ad697ade5.tar.bz2 linux-3.10-fe0dbcc9d2e941328b3269dab102b94ad697ade5.zip |
wl1251: fix trigger scan timeout usage
Use appropriate command (CMD_TRIGGER_SCAN_TO) instead of scan command
(CMD_SCAN) to configure trigger scan timeout.
This was broken in commit 3a98c30f3e8bb1f32b5bcb74a39647b3670de275.
This fix address the bug reported here:
https://bugzilla.kernel.org/show_bug.cgi?id=16554
Cc: stable@kernel.org
Signed-off-by: Yuri Ershov <ext-yuri.ershov@nokia.com>
Signed-off-by: Yuri Kululin <ext-yuri.kululin@nokia.com>
Acked-by: Kalle Valo <kvalo@adurom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/wl12xx/wl1251_cmd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1251_cmd.c b/drivers/net/wireless/wl12xx/wl1251_cmd.c index a37b30cef48..ce3722f4c3e 100644 --- a/drivers/net/wireless/wl12xx/wl1251_cmd.c +++ b/drivers/net/wireless/wl12xx/wl1251_cmd.c @@ -484,7 +484,7 @@ int wl1251_cmd_trigger_scan_to(struct wl1251 *wl, u32 timeout) cmd->timeout = timeout; - ret = wl1251_cmd_send(wl, CMD_SCAN, cmd, sizeof(*cmd)); + ret = wl1251_cmd_send(wl, CMD_TRIGGER_SCAN_TO, cmd, sizeof(*cmd)); if (ret < 0) { wl1251_error("cmd trigger scan to failed: %d", ret); goto out; |