From: Luciano Coelho <luciano.coelho@nokia.com>
Date: Wed, 20 Oct 2010 12:15:52 +0000 (+0300)
Subject: wl1271: exit ELP mode when setting enabled rates in tx
X-Git-Tag: v2.6.38-rc1~476^2~558^2~83
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5404643139c16e56d31a6ebd09cfa6db1eb03a36;p=platform%2Fkernel%2Flinux-3.10.git

wl1271: exit ELP mode when setting enabled rates in tx

This bug was being triggered by a call to acx_rate_policies in tx_work
without calling ps_elp_wakeup first.  If we have full PSM enabled, this
happens rather often, immediately after association.

Reported-by: Tuomas Katila <ext-tuomas.2.katila@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
Tested-by: Tuomas Katila <ext-tuomas.2.katila@nokia.com>
---

diff --git a/drivers/net/wireless/wl12xx/wl1271_tx.c b/drivers/net/wireless/wl12xx/wl1271_tx.c
index 46fafe0..279be5b 100644
--- a/drivers/net/wireless/wl12xx/wl1271_tx.c
+++ b/drivers/net/wireless/wl12xx/wl1271_tx.c
@@ -261,6 +261,11 @@ void wl1271_tx_work_locked(struct wl1271 *wl)
 
 	/* if rates have changed, re-configure the rate policy */
 	if (unlikely(sta_rates)) {
+		ret = wl1271_ps_elp_wakeup(wl, false);
+		if (ret < 0)
+			goto out;
+		woken_up = true;
+
 		wl->rate_set = wl1271_tx_enabled_rates_get(wl, sta_rates);
 		wl1271_acx_rate_policies(wl);
 	}