Author: adrian
Date: Wed Nov  9 05:39:17 2011
New Revision: 227377
URL: http://svn.freebsd.org/changeset/base/227377

Log:
  .. and add some ANI fixes missing from the last ANI commit.
  
  Obtained from:        Atheros
  Sponsored by: Hobnob, Inc.

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

Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c        Wed Nov  9 05:37:11 
2011        (r227376)
+++ head/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c        Wed Nov  9 05:39:17 
2011        (r227377)
@@ -384,18 +384,16 @@ ar5416AniOfdmErrTrigger(struct ath_hal *
        aniState = ahp->ah_curani;
        params = aniState->params;
        /* First, raise noise immunity level, up to max */
-       if ((AH5416(ah)->ah_ani_function & (1 << HAL_ANI_NOISE_IMMUNITY_LEVEL)) 
&&
-           (aniState->noiseImmunityLevel+1 < params->maxNoiseImmunityLevel)) {
-               ar5416AniControl(ah, HAL_ANI_NOISE_IMMUNITY_LEVEL, 
-                                aniState->noiseImmunityLevel + 1);
-               return;
+       if (aniState->noiseImmunityLevel+1 < params->maxNoiseImmunityLevel) {
+               if (ar5416AniControl(ah, HAL_ANI_NOISE_IMMUNITY_LEVEL, 
+                                aniState->noiseImmunityLevel + 1))
+                       return;
        }
        /* then, raise spur immunity level, up to max */
-       if ((AH5416(ah)->ah_ani_function & (1 << HAL_ANI_SPUR_IMMUNITY_LEVEL)) 
&&
-           (aniState->spurImmunityLevel+1 < params->maxSpurImmunityLevel)) {
-               ar5416AniControl(ah, HAL_ANI_SPUR_IMMUNITY_LEVEL,
-                                aniState->spurImmunityLevel + 1);
-               return;
+       if (aniState->spurImmunityLevel+1 < params->maxSpurImmunityLevel) {
+               if (ar5416AniControl(ah, HAL_ANI_SPUR_IMMUNITY_LEVEL,
+                                aniState->spurImmunityLevel + 1))
+                       return;
        }
 
        if (ANI_ENA_RSSI(ah)) {
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to