diff options
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2800lib.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c index 2db684283419..b5e646f70e8b 100644 --- a/drivers/net/wireless/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/rt2x00/rt2800lib.c | |||
@@ -2524,7 +2524,6 @@ static u8 rt2800_compensate_txpower(struct rt2x00_dev *rt2x00dev, int is_rate_b, | |||
2524 | enum ieee80211_band band, int power_level, | 2524 | enum ieee80211_band band, int power_level, |
2525 | u8 txpower, int delta) | 2525 | u8 txpower, int delta) |
2526 | { | 2526 | { |
2527 | u32 reg; | ||
2528 | u16 eeprom; | 2527 | u16 eeprom; |
2529 | u8 criterion; | 2528 | u8 criterion; |
2530 | u8 eirp_txpower; | 2529 | u8 eirp_txpower; |
@@ -2539,11 +2538,13 @@ static u8 rt2800_compensate_txpower(struct rt2x00_dev *rt2x00dev, int is_rate_b, | |||
2539 | * .11b data rate need add additional 4dbm | 2538 | * .11b data rate need add additional 4dbm |
2540 | * when calculating eirp txpower. | 2539 | * when calculating eirp txpower. |
2541 | */ | 2540 | */ |
2542 | rt2800_register_read(rt2x00dev, TX_PWR_CFG_0, ®); | 2541 | rt2x00_eeprom_read(rt2x00dev, EEPROM_TXPOWER_BYRATE + 1, |
2543 | criterion = rt2x00_get_field32(reg, TX_PWR_CFG_0_6MBS); | 2542 | &eeprom); |
2543 | criterion = rt2x00_get_field16(eeprom, | ||
2544 | EEPROM_TXPOWER_BYRATE_RATE0); | ||
2544 | 2545 | ||
2545 | rt2x00_eeprom_read(rt2x00dev, | 2546 | rt2x00_eeprom_read(rt2x00dev, EEPROM_EIRP_MAX_TX_POWER, |
2546 | EEPROM_EIRP_MAX_TX_POWER, &eeprom); | 2547 | &eeprom); |
2547 | 2548 | ||
2548 | if (band == IEEE80211_BAND_2GHZ) | 2549 | if (band == IEEE80211_BAND_2GHZ) |
2549 | eirp_txpower_criterion = rt2x00_get_field16(eeprom, | 2550 | eirp_txpower_criterion = rt2x00_get_field16(eeprom, |