summaryrefslogtreecommitdiff
path: root/package/mac80211/patches/594-ath9k_test_txpower.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-07-26 20:53:40 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-07-26 20:53:40 +0000
commitd6431df9c1c19e5b1f4f387e36c8f1825bce3b8f (patch)
tree14d5ac10f0920b0d737dc1dd67176d3592ded7ea /package/mac80211/patches/594-ath9k_test_txpower.patch
parent4da138d899ccd83869547b6454ce9297841caaa8 (diff)
downloadmtk-20170518-d6431df9c1c19e5b1f4f387e36c8f1825bce3b8f.zip
mtk-20170518-d6431df9c1c19e5b1f4f387e36c8f1825bce3b8f.tar.gz
mtk-20170518-d6431df9c1c19e5b1f4f387e36c8f1825bce3b8f.tar.bz2
ath9k: rework tx power handling - display the correct *current* tx power, and also fix tx power limits with ATH_USER_REGD set
SVN-Revision: 27788
Diffstat (limited to 'package/mac80211/patches/594-ath9k_test_txpower.patch')
-rw-r--r--package/mac80211/patches/594-ath9k_test_txpower.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/package/mac80211/patches/594-ath9k_test_txpower.patch b/package/mac80211/patches/594-ath9k_test_txpower.patch
new file mode 100644
index 0000000..45a51be
--- /dev/null
+++ b/package/mac80211/patches/594-ath9k_test_txpower.patch
@@ -0,0 +1,25 @@
+--- a/drivers/net/wireless/ath/ath9k/hw.c
++++ b/drivers/net/wireless/ath/ath9k/hw.c
+@@ -2442,15 +2442,18 @@ void ath9k_hw_set_txpowerlimit(struct at
+ struct ath_regulatory *regulatory = ath9k_hw_regulatory(ah);
+ struct ath9k_channel *chan = ah->curchan;
+ struct ieee80211_channel *channel = chan->chan;
++ int reg_pwr = min_t(int, MAX_RATE_POWER, regulatory->power_limit);
++ int chan_pwr = channel->max_power * 2;
++
++ if (test)
++ reg_pwr = chan_pwr = MAX_RATE_POWER;
+
+ regulatory->power_limit = min(limit, (u32) MAX_RATE_POWER);
+
+ ah->eep_ops->set_txpower(ah, chan,
+ ath9k_regd_get_ctl(regulatory, chan),
+ channel->max_antenna_gain * 2,
+- channel->max_power * 2,
+- min((u32) MAX_RATE_POWER,
+- (u32) regulatory->power_limit), test);
++ chan_pwr, reg_pwr, test);
+ }
+ EXPORT_SYMBOL(ath9k_hw_set_txpowerlimit);
+
+