| 12345678910111213141516171819202122232425262728293031323334353637 |
- From: Felix Fietkau <nbd@nbd.name>
- Date: Sat, 14 May 2016 14:51:02 +0200
- Subject: [PATCH] Revert "ath9k: interpret requested txpower in EIRP
- domain"
- This reverts commit 71f5137bf010c6faffab50c0ec15374c59c4a411.
- ---
- --- a/drivers/net/wireless/ath/ath9k/hw.c
- +++ b/drivers/net/wireless/ath/ath9k/hw.c
- @@ -2931,7 +2931,8 @@ void ath9k_hw_apply_txpower(struct ath_h
- {
- struct ath_regulatory *reg = ath9k_hw_regulatory(ah);
- struct ieee80211_channel *channel;
- - int chan_pwr, new_pwr;
- + int chan_pwr, new_pwr, max_gain;
- + int ant_gain, ant_reduction = 0;
-
- if (!chan)
- return;
- @@ -2939,10 +2940,15 @@ void ath9k_hw_apply_txpower(struct ath_h
- channel = chan->chan;
- chan_pwr = min_t(int, channel->max_power * 2, MAX_RATE_POWER);
- new_pwr = min_t(int, chan_pwr, reg->power_limit);
- + max_gain = chan_pwr - new_pwr + channel->max_antenna_gain * 2;
- +
- + ant_gain = get_antenna_gain(ah, chan);
- + if (ant_gain > max_gain)
- + ant_reduction = ant_gain - max_gain;
-
- ah->eep_ops->set_txpower(ah, chan,
- ath9k_regd_get_ctl(reg, chan),
- - get_antenna_gain(ah, chan), new_pwr, test);
- + ant_reduction, new_pwr, test);
- }
-
- void ath9k_hw_set_txpowerlimit(struct ath_hw *ah, u32 limit, bool test)
|
