|
@@ -693,8 +693,7 @@ static void ath9k_adjust_pdadc_values(struct ath_hw *ah,
|
|
|
}
|
|
|
|
|
|
static void ath9k_hw_set_def_power_cal_table(struct ath_hw *ah,
|
|
|
- struct ath9k_channel *chan,
|
|
|
- int16_t *pTxPowerIndexOffset)
|
|
|
+ struct ath9k_channel *chan)
|
|
|
{
|
|
|
#define SM_PD_GAIN(x) SM(0x38, AR_PHY_TPCRG5_PD_GAIN_BOUNDARY_##x)
|
|
|
#define SM_PDGAIN_B(x, y) \
|
|
@@ -855,7 +854,6 @@ static void ath9k_hw_set_def_power_cal_table(struct ath_hw *ah,
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- *pTxPowerIndexOffset = 0;
|
|
|
#undef SM_PD_GAIN
|
|
|
#undef SM_PDGAIN_B
|
|
|
}
|
|
@@ -1143,7 +1141,6 @@ static void ath9k_hw_def_set_txpower(struct ath_hw *ah,
|
|
|
struct modal_eep_header *pModal =
|
|
|
&(pEepData->modalHeader[IS_CHAN_2GHZ(chan)]);
|
|
|
int16_t ratesArray[Ar5416RateSize];
|
|
|
- int16_t txPowerIndexOffset = 0;
|
|
|
u8 ht40PowerIncForPdadc = 2;
|
|
|
int i, cck_ofdm_delta = 0;
|
|
|
|
|
@@ -1160,11 +1157,10 @@ static void ath9k_hw_def_set_txpower(struct ath_hw *ah,
|
|
|
twiceMaxRegulatoryPower,
|
|
|
powerLimit);
|
|
|
|
|
|
- ath9k_hw_set_def_power_cal_table(ah, chan, &txPowerIndexOffset);
|
|
|
+ ath9k_hw_set_def_power_cal_table(ah, chan);
|
|
|
|
|
|
regulatory->max_power_level = 0;
|
|
|
for (i = 0; i < ARRAY_SIZE(ratesArray); i++) {
|
|
|
- ratesArray[i] = (int16_t)(txPowerIndexOffset + ratesArray[i]);
|
|
|
if (ratesArray[i] > MAX_RATE_POWER)
|
|
|
ratesArray[i] = MAX_RATE_POWER;
|
|
|
if (ratesArray[i] > regulatory->max_power_level)
|