diff options
| author | Eliad Peller <eliad@wizery.com> | 2011-08-23 16:37:01 +0300 |
|---|---|---|
| committer | Luciano Coelho <coelho@ti.com> | 2011-08-25 10:19:28 +0300 |
| commit | 05dba3550603b9dc8609b5ea7c3ffba4e3bb97f2 (patch) | |
| tree | a34430ca8860465c46ead407be8220b85a20f49b /drivers/net | |
| parent | a879ed790a6108a3372be2d22a1ae81f59ab8db8 (diff) | |
| download | blackbird-op-linux-05dba3550603b9dc8609b5ea7c3ffba4e3bb97f2.tar.gz blackbird-op-linux-05dba3550603b9dc8609b5ea7c3ffba4e3bb97f2.zip | |
wl12xx: enter psm only after station role was started
The station didn't get into psm after recovery, because
psm was configured before sta role was started.
Move wl1271_ps_set_mode() to be executed only after
the role was started.
Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/wl12xx/main.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c index 3edc1d867836..0f72af9fc267 100644 --- a/drivers/net/wireless/wl12xx/main.c +++ b/drivers/net/wireless/wl12xx/main.c @@ -3361,19 +3361,6 @@ sta_not_found: ret = wl1271_acx_conn_monit_params(wl, true); if (ret < 0) goto out; - - /* If we want to go in PSM but we're not there yet */ - if (test_bit(WL1271_FLAG_PSM_REQUESTED, &wl->flags) && - !test_bit(WL1271_FLAG_PSM, &wl->flags)) { - enum wl1271_cmd_ps_mode mode; - - mode = STATION_POWER_SAVE_MODE; - ret = wl1271_ps_set_mode(wl, mode, - wl->basic_rate, - true); - if (ret < 0) - goto out; - } } else { /* use defaults when not associated */ bool was_assoc = @@ -3517,6 +3504,19 @@ sta_not_found: if (ret < 0) goto out; } + + /* If we want to go in PSM but we're not there yet */ + if (test_bit(WL1271_FLAG_PSM_REQUESTED, &wl->flags) && + !test_bit(WL1271_FLAG_PSM, &wl->flags)) { + enum wl1271_cmd_ps_mode mode; + + mode = STATION_POWER_SAVE_MODE; + ret = wl1271_ps_set_mode(wl, mode, + wl->basic_rate, + true); + if (ret < 0) + goto out; + } } /* Handle new association with HT. Do this after join. */ |
