svn commit: r243261 - stable/9/sys/dev/ath/ath_hal/ar5416

[Adrian Chadd]

Author: adrian
Date: Mon Nov 19 05:52:23 2012
New Revision: 243261
URL: http://svnweb.freebsd.org/changeset/base/243261

Log:
  Merge r227468: Don't fondle this particular CCA register from extension channel.

Modified:
  stable/9/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c

Modified: stable/9/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c
==============================================================================
--- stable/9/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c	Mon Nov 19 05:24:33 2012	(r243260)
+++ stable/9/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c	Mon Nov 19 05:52:23 2012	(r243261)
@@ -342,11 +342,6 @@ ar5416AniControl(struct ath_hal *ah, HAL
 		OS_REG_RMW_FIELD(ah, AR_PHY_TIMING5,
 		    AR_PHY_TIMING5_CYCPWR_THR1, params->cycPwrThr1[level]);
 
-		/* Only set the ext channel cycpwr_thr1 field for ht/40 */
-		if (IEEE80211_IS_CHAN_HT40(AH_PRIVATE(ah)->ah_curchan))
-			OS_REG_RMW_FIELD(ah, AR_PHY_EXT_CCA,
-			    AR_PHY_EXT_TIMING5_CYCPWR_THR1, params->cycPwrThr1[level]);
-
 		if (level > aniState->spurImmunityLevel)
 			ahp->ah_stats.ast_ani_spurup++;
 		else if (level < aniState->spurImmunityLevel)