[PATCH 1/1] wl1251: fix trigger scan timeout usage

[PATCH 1/1] wl1251: fix trigger scan timeout usage

[ext-yuri.kululin]

From: Yuri Kululin <ext-yuri.kululin@nokia.com>

Use appropriate command (CMD_TRIGGER_SCAN_TO) instead of scan command
(CMD_SCAN) to configure trigger scan timeout.

This was broken in commit 3a98c30f3e8bb1f32b5bcb74a39647b3670de275.

Cc: stable@kernel.org
Signed-off-by: Yuri Ershov <ext-yuri.ershov@nokia.com>
Signed-off-by: Yuri Kululin <ext-yuri.kululin@nokia.com>
---
 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 a37b30c..ce3722f 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;
-- 
1.7.1.1

Re: [PATCH 1/1] wl1251: fix trigger scan timeout usage

[Kalle Valo]

ext-yuri.kululin@nokia.com writes:

> From: Yuri Kululin <ext-yuri.kululin@nokia.com>
>
> Use appropriate command (CMD_TRIGGER_SCAN_TO) instead of scan command
> (CMD_SCAN) to configure trigger scan timeout.
>
> This was broken in commit 3a98c30f3e8bb1f32b5bcb74a39647b3670de275.

Good find. I broke this last January, sorry about that. 

John, the patch fixes this bug:

https://bugzilla.kernel.org/show_bug.cgi?id=16554

If possible, try to get this to 2.6.36. Otherwise wl1251 is more or
less broken. I'll make sure that this goes to stable releases as well.

> 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>

Thanks.

-- 
Kalle Valo