aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/linux/linux-2.6.35/nokia900/linux-2.6.36-wl1251-fix-trigger-scan-timeout-usage.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes/linux/linux-2.6.35/nokia900/linux-2.6.36-wl1251-fix-trigger-scan-timeout-usage.patch')
-rw-r--r--recipes/linux/linux-2.6.35/nokia900/linux-2.6.36-wl1251-fix-trigger-scan-timeout-usage.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/recipes/linux/linux-2.6.35/nokia900/linux-2.6.36-wl1251-fix-trigger-scan-timeout-usage.patch b/recipes/linux/linux-2.6.35/nokia900/linux-2.6.36-wl1251-fix-trigger-scan-timeout-usage.patch
new file mode 100644
index 0000000000..3a39735915
--- /dev/null
+++ b/recipes/linux/linux-2.6.35/nokia900/linux-2.6.36-wl1251-fix-trigger-scan-timeout-usage.patch
@@ -0,0 +1,37 @@
+From: "Kululin Yuri (EXT-Teleca/RussianFed)" <EXT-Yuri.Kululin@nokia.com>
+To: "kvalo@adurom.com" <kvalo@adurom.com>
+CC: "linux-wireless@vger.kernel.org" <linux-wireless@vger.kernel.org>, "Palande Ameya (Nokia-MS/Helsinki)" <ameya.palande@nokia.com>, "Kululin Yuri (EXT-Teleca/RussianFed)" <EXT-Yuri.Kululin@nokia.com>
+Date: Fri, 13 Aug 2010 11:46:12 +0200
+Subject: [PATCH 1/1] wl1251: fix trigger scan timeout usage
+
+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
+
+