diff --git a/[refs] b/[refs] index bab20c9a6c76..3b21b4cadfa6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1975ef2039c63f58e6c80861a24236bcd0483aa9 +refs/heads/master: 9950688263dcd74560582f590d270728f4e92ed0 diff --git a/trunk/drivers/net/wireless/ath9k/ani.c b/trunk/drivers/net/wireless/ath9k/ani.c index 4dd086073ad9..42197fff2a47 100644 --- a/trunk/drivers/net/wireless/ath9k/ani.c +++ b/trunk/drivers/net/wireless/ath9k/ani.c @@ -551,6 +551,9 @@ void ath9k_hw_ani_monitor(struct ath_hal *ah, struct ar5416AniState *aniState; int32_t listenTime; + if (!DO_ANI(ah)) + return; + aniState = ahp->ah_curani; ahp->ah_stats.ast_nodestats = *stats; @@ -610,9 +613,6 @@ void ath9k_hw_ani_monitor(struct ath_hal *ah, aniState->cckPhyErrCount = cckPhyErrCnt; } - if (!DO_ANI(ah)) - return; - if (aniState->listenTime > 5 * ahp->ah_aniPeriod) { if (aniState->ofdmPhyErrCount <= aniState->listenTime * aniState->ofdmTrigLow / 1000 &&