diff options
author | Kalle Valo <kvalo@qca.qualcomm.com> | 2011-12-16 14:10:39 -0500 |
---|---|---|
committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2011-12-16 14:10:39 -0500 |
commit | 7e95e365d5399647a41e10059e4b09826b82d78b (patch) | |
tree | 305c9968798adae3d9484657339fa39d2a5fdaac /drivers/net/wireless/ath/ath9k/eeprom_9287.c | |
parent | 3ca9d1fc9aa64077645a26c396de9399b49ea226 (diff) | |
parent | 5bd5e9a6ae5137a61d0b5c277eac61892d89fc4f (diff) |
Merge remote branch 'wireless-next/master' into ath6kl-next
Conflicts:
drivers/net/wireless/ath/ath6kl/init.c
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/eeprom_9287.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/eeprom_9287.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/eeprom_9287.c b/drivers/net/wireless/ath/ath9k/eeprom_9287.c index 4f5c50a87ce3..0981c073471d 100644 --- a/drivers/net/wireless/ath/ath9k/eeprom_9287.c +++ b/drivers/net/wireless/ath/ath9k/eeprom_9287.c | |||
@@ -569,7 +569,7 @@ static void ath9k_hw_set_ar9287_power_per_rate_table(struct ath_hw *ah, | |||
569 | #define REDUCE_SCALED_POWER_BY_TWO_CHAIN 6 | 569 | #define REDUCE_SCALED_POWER_BY_TWO_CHAIN 6 |
570 | #define REDUCE_SCALED_POWER_BY_THREE_CHAIN 10 | 570 | #define REDUCE_SCALED_POWER_BY_THREE_CHAIN 10 |
571 | 571 | ||
572 | u16 twiceMaxEdgePower = MAX_RATE_POWER; | 572 | u16 twiceMaxEdgePower; |
573 | int i; | 573 | int i; |
574 | struct cal_ctl_data_ar9287 *rep; | 574 | struct cal_ctl_data_ar9287 *rep; |
575 | struct cal_target_power_leg targetPowerOfdm = {0, {0, 0, 0, 0} }, | 575 | struct cal_target_power_leg targetPowerOfdm = {0, {0, 0, 0, 0} }, |
@@ -669,6 +669,7 @@ static void ath9k_hw_set_ar9287_power_per_rate_table(struct ath_hw *ah, | |||
669 | else | 669 | else |
670 | freq = centers.ctl_center; | 670 | freq = centers.ctl_center; |
671 | 671 | ||
672 | twiceMaxEdgePower = MAX_RATE_POWER; | ||
672 | /* Walk through the CTL indices stored in EEPROM */ | 673 | /* Walk through the CTL indices stored in EEPROM */ |
673 | for (i = 0; (i < AR9287_NUM_CTLS) && pEepData->ctlIndex[i]; i++) { | 674 | for (i = 0; (i < AR9287_NUM_CTLS) && pEepData->ctlIndex[i]; i++) { |
674 | struct cal_ctl_edges *pRdEdgesPower; | 675 | struct cal_ctl_edges *pRdEdgesPower; |