diff options
author | Luciano Coelho <luciano.coelho@nokia.com> | 2010-10-20 08:15:52 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-11-15 13:25:14 -0500 |
commit | 5404643139c16e56d31a6ebd09cfa6db1eb03a36 (patch) | |
tree | 0dff24dce36785fb24520f7b92f70a2ee9efef09 /drivers | |
parent | 6a2de93b2553c2e9a72997370534993c85c1eee6 (diff) |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_tx.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_tx.c b/drivers/net/wireless/wl12xx/wl1271_tx.c index 46fafe08f81a..279be5b98d9f 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) | |||
261 | 261 | ||
262 | /* if rates have changed, re-configure the rate policy */ | 262 | /* if rates have changed, re-configure the rate policy */ |
263 | if (unlikely(sta_rates)) { | 263 | if (unlikely(sta_rates)) { |
264 | ret = wl1271_ps_elp_wakeup(wl, false); | ||
265 | if (ret < 0) | ||
266 | goto out; | ||
267 | woken_up = true; | ||
268 | |||
264 | wl->rate_set = wl1271_tx_enabled_rates_get(wl, sta_rates); | 269 | wl->rate_set = wl1271_tx_enabled_rates_get(wl, sta_rates); |
265 | wl1271_acx_rate_policies(wl); | 270 | wl1271_acx_rate_policies(wl); |
266 | } | 271 | } |