diff options
| author | Mohammed Shafi Shajakhan <mshajakhan@atheros.com> | 2010-12-07 20:40:58 +0530 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-12-07 17:08:08 -0500 |
| commit | aaef24b4c9f5db726e618977b74ffef924360de5 (patch) | |
| tree | fbdaee34dbfd5bd41f17af1b1fc156c91731c1ce /drivers | |
| parent | caa0a99acd2c4eb0a8d4e9caae397291e4cf743a (diff) | |
| download | linux-3.10-aaef24b4c9f5db726e618977b74ffef924360de5.tar.gz linux-3.10-aaef24b4c9f5db726e618977b74ffef924360de5.tar.bz2 linux-3.10-aaef24b4c9f5db726e618977b74ffef924360de5.zip | |
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')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/recv.c | 7 |
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 3f8b2e32f36..0eac27d56da 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) } 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); |