diff options
| author | Adrian Chadd <adrian@FreeBSD.org> | 2018-06-08 18:15:23 +0000 |
|---|---|---|
| committer | Adrian Chadd <adrian@FreeBSD.org> | 2018-06-08 18:15:23 +0000 |
| commit | 7b1c2c4ec25d2e80ffa3417cc2dff36f66b9fa25 (patch) | |
| tree | bb70113bcfac6d34955bfc712b69d7a271c2bf04 /sys/dev | |
| parent | 7bca795ee0448f1a5db6593c1ddd1e8b59f2c3fb (diff) | |
| download | src-7b1c2c4ec25d2e80ffa3417cc2dff36f66b9fa25.tar.gz src-7b1c2c4ec25d2e80ffa3417cc2dff36f66b9fa25.zip | |
[ath_hal] Don't do ANI processing if we've reset.
If we've reset then we can't trust the current state of the ANI tracking,
so just wait until next time.
Tested:
* AR5424, STA mode (2GHz)
Notes
Notes:
svn path=/head/; revision=334848
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ath/ath_hal/ar5212/ar5212_ani.c | 3 | ||||
| -rw-r--r-- | sys/dev/ath/ath_hal/ar5416/ar5416_ani.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c b/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c index 4d4087012012..4e2cd683df8c 100644 --- a/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c +++ b/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c @@ -1000,6 +1000,9 @@ ar5212AniPoll(struct ath_hal *ah, const struct ieee80211_channel *chan) ahp->ah_stats.ast_ani_lneg++; /* restart ANI period if listenTime is invalid */ ar5212AniRestart(ah, aniState); + + /* Don't do any further ANI processing here */ + return; } /* XXX beware of overflow? */ aniState->listenTime += listenTime; diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c b/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c index 54f1293d9622..a10d884aaaf8 100644 --- a/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c +++ b/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c @@ -950,6 +950,9 @@ ar5416AniPoll(struct ath_hal *ah, const struct ieee80211_channel *chan) HALDEBUG(ah, HAL_DEBUG_ANI, "%s: invalid listenTime\n", __func__); ar5416AniRestart(ah, aniState); + + /* Don't do any further processing */ + return; } /* XXX beware of overflow? */ aniState->listenTime += listenTime; |