diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-08-01 12:15:15 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2011-08-01 12:15:15 +0000 |
| commit | a1e19186fa70e8bc918d825e31a50259ea8082fd (patch) | |
| tree | 7e08fcb20003dd62c1286426a50e8504e081e5db /package/mac80211/patches/554-ath9k_test_txpower.patch | |
| parent | 478decc60bb34144cc60b61c27378d8b0a0dce9b (diff) | |
| download | upstream-a1e19186fa70e8bc918d825e31a50259ea8082fd.tar.gz upstream-a1e19186fa70e8bc918d825e31a50259ea8082fd.tar.bz2 upstream-a1e19186fa70e8bc918d825e31a50259ea8082fd.zip | |
ath9k: fold patches that were merged upstream into 300-pending_work.patch
SVN-Revision: 27860
Diffstat (limited to 'package/mac80211/patches/554-ath9k_test_txpower.patch')
| -rw-r--r-- | package/mac80211/patches/554-ath9k_test_txpower.patch | 24 |
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 0000000000..96131dc9d2 --- /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); + |