ath9k: Fix power save with auto sleeping
authorVasanthakumar Thiagarajan <vasanth@atheros.com>
Tue, 18 May 2010 01:57:55 +0000 (18:57 -0700)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 2 Jun 2010 20:13:19 +0000 (16:13 -0400)
Rx should not be disabed/disabled when hw supports auto sleeping.

Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath9k/main.c

index b98b2f2ed07df89c0fa9a6a0628975c114407734..d6e8be0999bcb9e6e693589518d61e79fbf8d393 100644 (file)
@@ -1282,7 +1282,8 @@ static int ath9k_tx(struct ieee80211_hw *hw,
                 * completed and if needed, also for RX of buffered frames.
                 */
                ath9k_ps_wakeup(sc);
-               ath9k_hw_setrxabort(sc->sc_ah, 0);
+               if (!(sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_AUTOSLEEP))
+                       ath9k_hw_setrxabort(sc->sc_ah, 0);
                if (ieee80211_is_pspoll(hdr->frame_control)) {
                        ath_print(common, ATH_DBG_PS,
                                  "Sending PS-Poll to pick a buffered frame\n");
@@ -1546,8 +1547,8 @@ void ath9k_enable_ps(struct ath_softc *sc)
                        ah->imask |= ATH9K_INT_TIM_TIMER;
                        ath9k_hw_set_interrupts(ah, ah->imask);
                }
+               ath9k_hw_setrxabort(ah, 1);
        }
-       ath9k_hw_setrxabort(ah, 1);
 }
 
 static int ath9k_config(struct ieee80211_hw *hw, u32 changed)