aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-09-01 18:15:03 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-09-01 18:15:03 +0000
commit99e422472c4279c5a79faaa8a587b1ca33d04a5e (patch)
treecd6e5115caba1f9ba1fbedbd14332e1ad2b3c18a /package/mac80211
parent44616eca491f027a7a4828d3e719177545436fee (diff)
downloadupstream-99e422472c4279c5a79faaa8a587b1ca33d04a5e.tar.gz
upstream-99e422472c4279c5a79faaa8a587b1ca33d04a5e.tar.bz2
upstream-99e422472c4279c5a79faaa8a587b1ca33d04a5e.zip
ath9k: merge a fix for tx power limit testing
SVN-Revision: 28143
Diffstat (limited to 'package/mac80211')
-rw-r--r--package/mac80211/patches/300-pending_work.patch16
1 files changed, 16 insertions, 0 deletions
diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch
index ce766af82e..c234e9d694 100644
--- a/package/mac80211/patches/300-pending_work.patch
+++ b/package/mac80211/patches/300-pending_work.patch
@@ -296,6 +296,22 @@
rx_lat = MS(reg, AR_USEC_RX_LAT);
tx_lat = MS(reg, AR_USEC_TX_LAT);
+@@ -2441,13 +2450,13 @@ 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 reg_pwr = min_t(int, MAX_RATE_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);
++ regulatory->power_limit = reg_pwr;
+
+ ah->eep_ops->set_txpower(ah, chan,
+ ath9k_regd_get_ctl(regulatory, chan),
--- a/drivers/net/wireless/ath/ath9k/reg.h
+++ b/drivers/net/wireless/ath/ath9k/reg.h
@@ -619,6 +619,7 @@