aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl12xx
diff options
context:
space:
mode:
authorLuciano Coelho <luciano.coelho@nokia.com>2009-10-13 05:47:58 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-10-27 16:48:16 -0400
commitbd5ea18f7b47b5397233301920180128793295a2 (patch)
tree7f67275b3ee1cbc5a7a25d78dbd64bd1f98f78b8 /drivers/net/wireless/wl12xx
parented317788b925cfd896506ee775acca7392470b9b (diff)
wl1271: make sure PS is disabled in PLT
We cannot be in PS mode when running PLT tests, so we need to make sure we're in active mode. Also, we need to clear up the rx_counter when we stop PLT, otherwise it could cause problems when entering PLT again. Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com> Reviewed-by: Juuso Oikarinen <juuso.oikarinen@nokia.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx')
-rw-r--r--drivers/net/wireless/wl12xx/wl1271_main.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
index dfa08a188632..7b8d2799f23e 100644
--- a/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/drivers/net/wireless/wl12xx/wl1271_main.c
@@ -774,6 +774,11 @@ int wl1271_plt_start(struct wl1271 *wl)
774 if (ret < 0) 774 if (ret < 0)
775 goto out_irq_disable; 775 goto out_irq_disable;
776 776
777 /* Make sure power saving is disabled */
778 ret = wl1271_acx_sleep_auth(wl, WL1271_PSM_CAM);
779 if (ret < 0)
780 goto out_irq_disable;
781
777 goto out; 782 goto out;
778 783
779out_irq_disable: 784out_irq_disable:
@@ -807,6 +812,7 @@ int wl1271_plt_stop(struct wl1271 *wl)
807 wl1271_power_off(wl); 812 wl1271_power_off(wl);
808 813
809 wl->state = WL1271_STATE_OFF; 814 wl->state = WL1271_STATE_OFF;
815 wl->rx_counter = 0;
810 816
811out: 817out:
812 mutex_unlock(&wl->mutex); 818 mutex_unlock(&wl->mutex);