diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-07-26 20:53:40 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2011-07-26 20:53:40 +0000 |
| commit | f14e91f44dbcda3931768344e3e639c9ff53d7f7 (patch) | |
| tree | 84d29738e5f8548da8d562f4189b3070cd345f0e /package/mac80211/patches/594-ath9k_test_txpower.patch | |
| parent | 3b7bbd29a3baee0bbdfab4e3d062c29fcb100247 (diff) | |
| download | upstream-f14e91f44dbcda3931768344e3e639c9ff53d7f7.tar.gz upstream-f14e91f44dbcda3931768344e3e639c9ff53d7f7.tar.bz2 upstream-f14e91f44dbcda3931768344e3e639c9ff53d7f7.zip | |
ath9k: rework tx power handling - display the correct *current* tx power, and also fix tx power limits with ATH_USER_REGD set
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27788 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/594-ath9k_test_txpower.patch')
| -rw-r--r-- | package/mac80211/patches/594-ath9k_test_txpower.patch | 25 |
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 00000000000..45a51be61e0 --- /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); + + |