diff options
| author | Luciano Coelho <luciano.coelho@nokia.com> | 2010-10-20 15:15:52 +0300 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-11-15 13:25:14 -0500 |
| commit | 5404643139c16e56d31a6ebd09cfa6db1eb03a36 (patch) | |
| tree | 0dff24dce36785fb24520f7b92f70a2ee9efef09 /drivers/net/wireless/wl12xx | |
| parent | 6a2de93b2553c2e9a72997370534993c85c1eee6 (diff) | |
| download | linux-stable-5404643139c16e56d31a6ebd09cfa6db1eb03a36.tar.gz linux-stable-5404643139c16e56d31a6ebd09cfa6db1eb03a36.tar.bz2 linux-stable-5404643139c16e56d31a6ebd09cfa6db1eb03a36.zip | |
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/net/wireless/wl12xx')
| -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) /* 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); } |