aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
diff options
context:
space:
mode:
authorSujith Manoharan <c_manoha@qca.qualcomm.com>2012-12-09 20:52:37 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-12-10 15:49:50 -0500
commit0f21ee8d9c8a041b974cfb75d81d07b61bd0869f (patch)
tree98f302397e27e08b361d3e2233616720a4fb46a3 /drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
parentd882d242e4bfb2016e611a5aab0112fcece7a8ac (diff)
ath9k_hw: Add HW cap for PAPRD
Add a HW capability to indicate whether PAPRD is enabled for the card, since PAPRD could be enabled in the EEPROM, but disabled in the driver. This makes things clearer. Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/ar9003_eeprom.c')
-rw-r--r--drivers/net/wireless/ath/ath9k/ar9003_eeprom.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
index c86cb6400040..6b8861c559ed 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
@@ -2987,10 +2987,6 @@ static u32 ath9k_hw_ar9300_get_eeprom(struct ath_hw *ah,
2987 case EEP_RX_MASK: 2987 case EEP_RX_MASK:
2988 return pBase->txrxMask & 0xf; 2988 return pBase->txrxMask & 0xf;
2989 case EEP_PAPRD: 2989 case EEP_PAPRD:
2990 if (AR_SREV_9462(ah))
2991 return false;
2992 if (!ah->config.enable_paprd)
2993 return false;
2994 return !!(pBase->featureEnable & BIT(5)); 2990 return !!(pBase->featureEnable & BIT(5));
2995 case EEP_CHAIN_MASK_REDUCE: 2991 case EEP_CHAIN_MASK_REDUCE:
2996 return (pBase->miscConfiguration >> 0x3) & 0x1; 2992 return (pBase->miscConfiguration >> 0x3) & 0x1;
@@ -5097,7 +5093,7 @@ static void ath9k_hw_ar9300_set_txpower(struct ath_hw *ah,
5097 */ 5093 */
5098 ar9003_hw_get_target_power_eeprom(ah, chan, targetPowerValT2); 5094 ar9003_hw_get_target_power_eeprom(ah, chan, targetPowerValT2);
5099 5095
5100 if (ah->eep_ops->get_eeprom(ah, EEP_PAPRD)) { 5096 if (ar9003_is_paprd_enabled(ah)) {
5101 if (IS_CHAN_2GHZ(chan)) 5097 if (IS_CHAN_2GHZ(chan))
5102 modal_hdr = &eep->modalHeader2G; 5098 modal_hdr = &eep->modalHeader2G;
5103 else 5099 else
@@ -5138,7 +5134,7 @@ static void ath9k_hw_ar9300_set_txpower(struct ath_hw *ah,
5138 twiceAntennaReduction, 5134 twiceAntennaReduction,
5139 powerLimit); 5135 powerLimit);
5140 5136
5141 if (ah->eep_ops->get_eeprom(ah, EEP_PAPRD)) { 5137 if (ar9003_is_paprd_enabled(ah)) {
5142 for (i = 0; i < ar9300RateSize; i++) { 5138 for (i = 0; i < ar9300RateSize; i++) {
5143 if ((ah->paprd_ratemask & (1 << i)) && 5139 if ((ah->paprd_ratemask & (1 << i)) &&
5144 (abs(targetPowerValT2[i] - 5140 (abs(targetPowerValT2[i] -