diff options
Diffstat (limited to 'drivers/net/wireless/ath9k/eeprom.c')
-rw-r--r-- | drivers/net/wireless/ath9k/eeprom.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/wireless/ath9k/eeprom.c b/drivers/net/wireless/ath9k/eeprom.c index 420a060e32ae..d58d8a330b64 100644 --- a/drivers/net/wireless/ath9k/eeprom.c +++ b/drivers/net/wireless/ath9k/eeprom.c | |||
@@ -1232,9 +1232,9 @@ static bool ath9k_hw_set_def_power_per_rate_table(struct ath_hal *ah, | |||
1232 | 1232 | ||
1233 | maxRegAllowedPower = twiceMaxRegulatoryPower + twiceLargestAntenna; | 1233 | maxRegAllowedPower = twiceMaxRegulatoryPower + twiceLargestAntenna; |
1234 | 1234 | ||
1235 | if (ah->ah_tpScale != ATH9K_TP_SCALE_MAX) { | 1235 | if (ah->regulatory.tp_scale != ATH9K_TP_SCALE_MAX) { |
1236 | maxRegAllowedPower -= | 1236 | maxRegAllowedPower -= |
1237 | (tpScaleReductionTable[(ah->ah_tpScale)] * 2); | 1237 | (tpScaleReductionTable[(ah->regulatory.tp_scale)] * 2); |
1238 | } | 1238 | } |
1239 | 1239 | ||
1240 | scaledPower = min(powerLimit, maxRegAllowedPower); | 1240 | scaledPower = min(powerLimit, maxRegAllowedPower); |
@@ -1510,9 +1510,9 @@ static bool ath9k_hw_set_4k_power_per_rate_table(struct ath_hal *ah, | |||
1510 | 1510 | ||
1511 | maxRegAllowedPower = twiceMaxRegulatoryPower + twiceLargestAntenna; | 1511 | maxRegAllowedPower = twiceMaxRegulatoryPower + twiceLargestAntenna; |
1512 | 1512 | ||
1513 | if (ah->ah_tpScale != ATH9K_TP_SCALE_MAX) { | 1513 | if (ah->regulatory.tp_scale != ATH9K_TP_SCALE_MAX) { |
1514 | maxRegAllowedPower -= | 1514 | maxRegAllowedPower -= |
1515 | (tpScaleReductionTable[(ah->ah_tpScale)] * 2); | 1515 | (tpScaleReductionTable[(ah->regulatory.tp_scale)] * 2); |
1516 | } | 1516 | } |
1517 | 1517 | ||
1518 | scaledPower = min(powerLimit, maxRegAllowedPower); | 1518 | scaledPower = min(powerLimit, maxRegAllowedPower); |
@@ -1823,10 +1823,10 @@ static int ath9k_hw_def_set_txpower(struct ath_hal *ah, | |||
1823 | i = rateHt20_0; | 1823 | i = rateHt20_0; |
1824 | 1824 | ||
1825 | if (AR_SREV_9280_10_OR_LATER(ah)) | 1825 | if (AR_SREV_9280_10_OR_LATER(ah)) |
1826 | ah->ah_maxPowerLevel = | 1826 | ah->regulatory.max_power_level = |
1827 | ratesArray[i] + AR5416_PWR_TABLE_OFFSET * 2; | 1827 | ratesArray[i] + AR5416_PWR_TABLE_OFFSET * 2; |
1828 | else | 1828 | else |
1829 | ah->ah_maxPowerLevel = ratesArray[i]; | 1829 | ah->regulatory.max_power_level = ratesArray[i]; |
1830 | 1830 | ||
1831 | return 0; | 1831 | return 0; |
1832 | } | 1832 | } |
@@ -1951,10 +1951,10 @@ static int ath9k_hw_4k_set_txpower(struct ath_hal *ah, | |||
1951 | i = rateHt20_0; | 1951 | i = rateHt20_0; |
1952 | 1952 | ||
1953 | if (AR_SREV_9280_10_OR_LATER(ah)) | 1953 | if (AR_SREV_9280_10_OR_LATER(ah)) |
1954 | ah->ah_maxPowerLevel = | 1954 | ah->regulatory.max_power_level = |
1955 | ratesArray[i] + AR5416_PWR_TABLE_OFFSET * 2; | 1955 | ratesArray[i] + AR5416_PWR_TABLE_OFFSET * 2; |
1956 | else | 1956 | else |
1957 | ah->ah_maxPowerLevel = ratesArray[i]; | 1957 | ah->regulatory.max_power_level = ratesArray[i]; |
1958 | 1958 | ||
1959 | return 0; | 1959 | return 0; |
1960 | } | 1960 | } |