aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorMohammed Shafi Shajakhan <mshajakhan@atheros.com>2010-12-07 10:10:58 -0500
committerJohn W. Linville <linville@tuxdriver.com>2010-12-07 17:08:08 -0500
commitaaef24b4c9f5db726e618977b74ffef924360de5 (patch)
treefbdaee34dbfd5bd41f17af1b1fc156c91731c1ce /drivers/net
parentcaa0a99acd2c4eb0a8d4e9caae397291e4cf743a (diff)
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>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/ath/ath9k/recv.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c
index 3f8b2e32f364..0eac27d56da7 100644
--- 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)
1745 } 1745 }
1746 1746
1747 spin_lock_irqsave(&sc->sc_pm_lock, flags); 1747 spin_lock_irqsave(&sc->sc_pm_lock, flags);
1748 if (unlikely(ath9k_check_auto_sleep(sc) || 1748
1749 (sc->ps_flags & (PS_WAIT_FOR_BEACON | 1749 if ((sc->ps_flags & (PS_WAIT_FOR_BEACON |
1750 PS_WAIT_FOR_CAB | 1750 PS_WAIT_FOR_CAB |
1751 PS_WAIT_FOR_PSPOLL_DATA)))) 1751 PS_WAIT_FOR_PSPOLL_DATA)) ||
1752 unlikely(ath9k_check_auto_sleep(sc)))
1752 ath_rx_ps(sc, skb); 1753 ath_rx_ps(sc, skb);
1753 spin_unlock_irqrestore(&sc->sc_pm_lock, flags); 1754 spin_unlock_irqrestore(&sc->sc_pm_lock, flags);
1754 1755