wl1271: Fix warning when disconnecting and ad-hoc network
authorJuuso Oikarinen <juuso.oikarinen@nokia.com>
Thu, 8 Jul 2010 14:50:04 +0000 (17:50 +0300)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 8 Jul 2010 20:35:51 +0000 (16:35 -0400)
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: Luciano Coelho <luciano.coelho@nokia.com>
Reviewed-by: Teemu Paasikivi <ext-teemu.3.paasikivi@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 366e41518feb820bc534c65984188697dc60efbc..d50c0a9835a0cb9bf83ca2a186c0ae4f272c68f1 100644 (file)
@@ -938,7 +938,8 @@ static void wl1271_op_remove_interface(struct ieee80211_hw *hw,
        WARN_ON(wl->state != WL1271_STATE_ON);
 
        /* enable dyn ps just in case (if left on due to fw crash etc) */
-       ieee80211_disable_dyn_ps(wl->vif, false);
+       if (wl->bss_type == BSS_TYPE_STA_BSS)
+               ieee80211_disable_dyn_ps(wl->vif, false);
 
        if (test_and_clear_bit(WL1271_FLAG_SCANNING, &wl->flags)) {
                mutex_unlock(&wl->mutex);