svn commit: r334848 - in head/sys/dev/ath/ath_hal: ar5212 ar5416

Adrian Chadd adrian at FreeBSD.org
Fri Jun 8 18:15:25 UTC 2018


Author: adrian
Date: Fri Jun  8 18:15:23 2018
New Revision: 334848
URL: https://svnweb.freebsd.org/changeset/base/334848

Log:
  [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)

Modified:
  head/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c
  head/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c

Modified: head/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c	Fri Jun  8 18:09:19 2018	(r334847)
+++ head/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c	Fri Jun  8 18:15:23 2018	(r334848)
@@ -1000,6 +1000,9 @@ ar5212AniPoll(struct ath_hal *ah, const struct ieee802
 		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;

Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c	Fri Jun  8 18:09:19 2018	(r334847)
+++ head/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c	Fri Jun  8 18:15:23 2018	(r334848)
@@ -950,6 +950,9 @@ ar5416AniPoll(struct ath_hal *ah, const struct ieee802
 		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;


More information about the svn-src-all mailing list