aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuis R. Rodriguez <lrodriguez@atheros.com>2010-04-15 17:38:22 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-04-16 15:43:20 -0400
commit31a0bd3c7564ec79cf86a3eb9f9aaa3c47099d9b (patch)
tree698638c00800f1f3e26dfa0ebe34c25cf172d2cd
parent61accab9b5cfc2a7f42c88f30656d9f1771400d3 (diff)
ath9k_hw: disable ANI for AR9003
ANI is still being debugged on AR9003 by our systems team so it should not yet be enabled yet. When ANI will be enabled all ANI functionality is expected to be enabled so fill the ANI functionality to all for AR9003 for now as well. Cc: Enis Akay <Enis.Akay@atheros.com> Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-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);