diff options
author | Saravanan Dhanabal <ext-saravanan.dhanabal@nokia.com> | 2010-04-09 04:07:28 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-04-09 13:43:10 -0400 |
commit | aecb0565e3e331d4dd23b4d35180519532015f22 (patch) | |
tree | 6ae7729e1f24c46787edb4e47cbaec74f48305a6 | |
parent | 2c10bb9cb3f9cecb71bd2cbb771778136433ebe2 (diff) |
wl1271: Fix mac80211 RTS threshold requests during WL1271_STATE_OFF
mac80211 sends RTS threshold configuration request even if the wl1271 interface
state is WL1271_STATE_OFF. This leads to failures during pm tests.
This patch leaves the configuration function, if the interface is
going down.
Signed-off-by: Saravanan Dhanabal <ext-saravanan.dhanabal@nokia.com>
Reviewed-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_main.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c index 2eb7b99ff276..4adc5162e7e5 100644 --- a/drivers/net/wireless/wl12xx/wl1271_main.c +++ b/drivers/net/wireless/wl12xx/wl1271_main.c | |||
@@ -1582,10 +1582,13 @@ out: | |||
1582 | static int wl1271_op_set_rts_threshold(struct ieee80211_hw *hw, u32 value) | 1582 | static int wl1271_op_set_rts_threshold(struct ieee80211_hw *hw, u32 value) |
1583 | { | 1583 | { |
1584 | struct wl1271 *wl = hw->priv; | 1584 | struct wl1271 *wl = hw->priv; |
1585 | int ret; | 1585 | int ret = 0; |
1586 | 1586 | ||
1587 | mutex_lock(&wl->mutex); | 1587 | mutex_lock(&wl->mutex); |
1588 | 1588 | ||
1589 | if (unlikely(wl->state == WL1271_STATE_OFF)) | ||
1590 | goto out; | ||
1591 | |||
1589 | ret = wl1271_ps_elp_wakeup(wl, false); | 1592 | ret = wl1271_ps_elp_wakeup(wl, false); |
1590 | if (ret < 0) | 1593 | if (ret < 0) |
1591 | goto out; | 1594 | goto out; |