| From fe0dbcc9d2e941328b3269dab102b94ad697ade5 Mon Sep 17 00:00:00 2001 |
| From: Yuri Kululin <ext-yuri.kululin@nokia.com> |
| Date: Fri, 13 Aug 2010 13:46:12 +0400 |
| Subject: wl1251: fix trigger scan timeout usage |
| |
| From: Yuri Kululin <ext-yuri.kululin@nokia.com> |
| |
| commit fe0dbcc9d2e941328b3269dab102b94ad697ade5 upstream. |
| |
| 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 |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/net/wireless/wl12xx/wl1251_cmd.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- 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 wl |
| |
| 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; |
