aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/ath/ath9k/hw.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 56cae9500293..39dac9797e48 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -363,7 +363,13 @@ static void ath9k_hw_init_config(struct ath_hw *ah)
363 ah->config.ofdm_trig_high = 500; 363 ah->config.ofdm_trig_high = 500;
364 ah->config.cck_trig_high = 200; 364 ah->config.cck_trig_high = 200;
365 ah->config.cck_trig_low = 100; 365 ah->config.cck_trig_low = 100;
366 ah->config.enable_ani = 1; 366
367 /*
368 * For now ANI is disabled for AR9003, it is still
369 * being tested.
370 */
371 if (!AR_SREV_9300_20_OR_LATER(ah))
372 ah->config.enable_ani = 1;
367 373
368 for (i = 0; i < AR_EEPROM_MODAL_SPURS; i++) { 374 for (i = 0; i < AR_EEPROM_MODAL_SPURS; i++) {
369 ah->config.spurchans[i][0] = AR_NO_SPUR; 375 ah->config.spurchans[i][0] = AR_NO_SPUR;
@@ -941,7 +947,7 @@ static int __ath9k_hw_init(struct ath_hw *ah)
941 ath9k_hw_init_cal_settings(ah); 947 ath9k_hw_init_cal_settings(ah);
942 948
943 ah->ani_function = ATH9K_ANI_ALL; 949 ah->ani_function = ATH9K_ANI_ALL;
944 if (AR_SREV_9280_10_OR_LATER(ah)) 950 if (AR_SREV_9280_10_OR_LATER(ah) && !AR_SREV_9300_20_OR_LATER(ah))
945 ah->ani_function &= ~ATH9K_ANI_NOISE_IMMUNITY_LEVEL; 951 ah->ani_function &= ~ATH9K_ANI_NOISE_IMMUNITY_LEVEL;
946 952
947 ath9k_hw_init_mode_regs(ah); 953 ath9k_hw_init_mode_regs(ah);