summaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/554-ath9k_test_txpower.patch
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-08-01 12:15:15 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-08-01 12:15:15 +0000
commit99a41c0ace85fce0efca7bedd39d0c88429fdc12 (patch)
tree88aa050ff0bbb96dbd78955e42fcc1b26ee5c800 /package/mac80211/patches/554-ath9k_test_txpower.patch
parent4371be6c65c16464d42c70ebabc476f036618166 (diff)
ath9k: fold patches that were merged upstream into 300-pending_work.patch
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27860 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/554-ath9k_test_txpower.patch')
-rw-r--r--package/mac80211/patches/554-ath9k_test_txpower.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/package/mac80211/patches/554-ath9k_test_txpower.patch b/package/mac80211/patches/554-ath9k_test_txpower.patch
new file mode 100644
index 000000000..96131dc9d
--- /dev/null
+++ b/package/mac80211/patches/554-ath9k_test_txpower.patch
@@ -0,0 +1,24 @@
+--- 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);
+