wl1271: Fix mac80211 RTS threshold requests during WL1271_STATE_OFF
authorSaravanan Dhanabal <ext-saravanan.dhanabal@nokia.com>
Fri, 9 Apr 2010 08:07:28 +0000 (11:07 +0300)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 9 Apr 2010 17:43:10 +0000 (13:43 -0400)
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>
drivers/net/wireless/wl12xx/wl1271_main.c

index 2eb7b99ff2765f27b13a721a97ad9e7b2d784fff..4adc5162e7e55924f884205200afe2bb370ad6a9 100644 (file)
@@ -1582,10 +1582,13 @@ out:
 static int wl1271_op_set_rts_threshold(struct ieee80211_hw *hw, u32 value)
 {
        struct wl1271 *wl = hw->priv;
-       int ret;
+       int ret = 0;
 
        mutex_lock(&wl->mutex);
 
+       if (unlikely(wl->state == WL1271_STATE_OFF))
+               goto out;
+
        ret = wl1271_ps_elp_wakeup(wl, false);
        if (ret < 0)
                goto out;