302-Revert-ath9k-interpret-requested-txpower-in-EIRP-dom.patch 1.2 KB

12345678910111213141516171819202122232425262728293031323334353637
  1. From: Felix Fietkau <nbd@nbd.name>
  2. Date: Sat, 14 May 2016 14:51:02 +0200
  3. Subject: [PATCH] Revert "ath9k: interpret requested txpower in EIRP
  4. domain"
  5. This reverts commit 71f5137bf010c6faffab50c0ec15374c59c4a411.
  6. ---
  7. --- a/drivers/net/wireless/ath/ath9k/hw.c
  8. +++ b/drivers/net/wireless/ath/ath9k/hw.c
  9. @@ -2914,7 +2914,8 @@ void ath9k_hw_apply_txpower(struct ath_h
  10. {
  11. struct ath_regulatory *reg = ath9k_hw_regulatory(ah);
  12. struct ieee80211_channel *channel;
  13. - int chan_pwr, new_pwr;
  14. + int chan_pwr, new_pwr, max_gain;
  15. + int ant_gain, ant_reduction = 0;
  16. if (!chan)
  17. return;
  18. @@ -2922,10 +2923,15 @@ void ath9k_hw_apply_txpower(struct ath_h
  19. channel = chan->chan;
  20. chan_pwr = min_t(int, channel->max_power * 2, MAX_RATE_POWER);
  21. new_pwr = min_t(int, chan_pwr, reg->power_limit);
  22. + max_gain = chan_pwr - new_pwr + channel->max_antenna_gain * 2;
  23. +
  24. + ant_gain = get_antenna_gain(ah, chan);
  25. + if (ant_gain > max_gain)
  26. + ant_reduction = ant_gain - max_gain;
  27. ah->eep_ops->set_txpower(ah, chan,
  28. ath9k_regd_get_ctl(reg, chan),
  29. - get_antenna_gain(ah, chan), new_pwr, test);
  30. + ant_reduction, new_pwr, test);
  31. }
  32. void ath9k_hw_set_txpowerlimit(struct ath_hw *ah, u32 limit, bool test)