ath9k: Properly use unlikely check macro

AUTOSLEEP feature is enabled only for AR9271 and AR9003 version
chipsets.So unlikely macro should be used only to check whether
auto-sleep feature is enabled

Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c
index 3f8b2e32f36477e1d6e8539df0d2cc63053985b3..0eac27d56da7c015f6d2cb7a4b919d538e081fea 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/recv.c
+++ b/drivers/net/wireless/ath/ath9k/recv.c
@@ -1745,10 +1745,11 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
                }
 
                spin_lock_irqsave(&sc->sc_pm_lock, flags);
-               if (unlikely(ath9k_check_auto_sleep(sc) ||
-                            (sc->ps_flags & (PS_WAIT_FOR_BEACON |
+
+               if ((sc->ps_flags & (PS_WAIT_FOR_BEACON |
                                              PS_WAIT_FOR_CAB |
-                                             PS_WAIT_FOR_PSPOLL_DATA))))
+                                             PS_WAIT_FOR_PSPOLL_DATA)) ||
+                                       unlikely(ath9k_check_auto_sleep(sc)))
                        ath_rx_ps(sc, skb);
                spin_unlock_irqrestore(&sc->sc_pm_lock, flags);