diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/calib.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath/ath9k/calib.c b/drivers/net/wireless/ath/ath9k/calib.c index 238a5744d8e9..0c3e9c8fa017 100644 --- a/drivers/net/wireless/ath/ath9k/calib.c +++ b/drivers/net/wireless/ath/ath9k/calib.c | |||
@@ -103,7 +103,7 @@ static void ath9k_hw_do_getnf(struct ath_hw *ah, | |||
103 | "NF calibrated [ctl] [chain 0] is %d\n", nf); | 103 | "NF calibrated [ctl] [chain 0] is %d\n", nf); |
104 | nfarray[0] = nf; | 104 | nfarray[0] = nf; |
105 | 105 | ||
106 | if (!AR_SREV_9285(ah)) { | 106 | if (!AR_SREV_9285(ah) && !AR_SREV_9271(ah)) { |
107 | if (AR_SREV_9280_10_OR_LATER(ah)) | 107 | if (AR_SREV_9280_10_OR_LATER(ah)) |
108 | nf = MS(REG_READ(ah, AR_PHY_CH1_CCA), | 108 | nf = MS(REG_READ(ah, AR_PHY_CH1_CCA), |
109 | AR9280_PHY_CH1_MINCCA_PWR); | 109 | AR9280_PHY_CH1_MINCCA_PWR); |
@@ -141,7 +141,7 @@ static void ath9k_hw_do_getnf(struct ath_hw *ah, | |||
141 | "NF calibrated [ext] [chain 0] is %d\n", nf); | 141 | "NF calibrated [ext] [chain 0] is %d\n", nf); |
142 | nfarray[3] = nf; | 142 | nfarray[3] = nf; |
143 | 143 | ||
144 | if (!AR_SREV_9285(ah)) { | 144 | if (!AR_SREV_9285(ah) && !AR_SREV_9271(ah)) { |
145 | if (AR_SREV_9280_10_OR_LATER(ah)) | 145 | if (AR_SREV_9280_10_OR_LATER(ah)) |
146 | nf = MS(REG_READ(ah, AR_PHY_CH1_EXT_CCA), | 146 | nf = MS(REG_READ(ah, AR_PHY_CH1_EXT_CCA), |
147 | AR9280_PHY_CH1_EXT_MINCCA_PWR); | 147 | AR9280_PHY_CH1_EXT_MINCCA_PWR); |
@@ -621,7 +621,7 @@ void ath9k_hw_loadnf(struct ath_hw *ah, struct ath9k_channel *chan) | |||
621 | u8 chainmask, rx_chain_status; | 621 | u8 chainmask, rx_chain_status; |
622 | 622 | ||
623 | rx_chain_status = REG_READ(ah, AR_PHY_RX_CHAINMASK); | 623 | rx_chain_status = REG_READ(ah, AR_PHY_RX_CHAINMASK); |
624 | if (AR_SREV_9285(ah)) | 624 | if (AR_SREV_9285(ah) || AR_SREV_9271(ah)) |
625 | chainmask = 0x9; | 625 | chainmask = 0x9; |
626 | else if (AR_SREV_9280(ah) || AR_SREV_9287(ah)) { | 626 | else if (AR_SREV_9280(ah) || AR_SREV_9287(ah)) { |
627 | if ((rx_chain_status & 0x2) || (rx_chain_status & 0x4)) | 627 | if ((rx_chain_status & 0x2) || (rx_chain_status & 0x4)) |
@@ -715,7 +715,7 @@ void ath9k_init_nfcal_hist_buffer(struct ath_hw *ah) | |||
715 | 715 | ||
716 | if (AR_SREV_9280(ah)) | 716 | if (AR_SREV_9280(ah)) |
717 | noise_floor = AR_PHY_CCA_MAX_AR9280_GOOD_VALUE; | 717 | noise_floor = AR_PHY_CCA_MAX_AR9280_GOOD_VALUE; |
718 | else if (AR_SREV_9285(ah)) | 718 | else if (AR_SREV_9285(ah) || AR_SREV_9271(ah)) |
719 | noise_floor = AR_PHY_CCA_MAX_AR9285_GOOD_VALUE; | 719 | noise_floor = AR_PHY_CCA_MAX_AR9285_GOOD_VALUE; |
720 | else if (AR_SREV_9287(ah)) | 720 | else if (AR_SREV_9287(ah)) |
721 | noise_floor = AR_PHY_CCA_MAX_AR9287_GOOD_VALUE; | 721 | noise_floor = AR_PHY_CCA_MAX_AR9287_GOOD_VALUE; |