diff options
author | Felix Fietkau <nbd@openwrt.org> | 2011-09-17 16:02:56 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2011-09-17 16:02:56 +0000 |
commit | e327db6d62323855680731cec8275d26df90ce7e (patch) | |
tree | e78735e10fd19a35d9a6966e23fcc6cf20eaff9c /package/mac80211/patches/531-ath9k_cur_txpower.patch | |
parent | b87111b121dee11a57bb8a2d184d3bb8b1c36175 (diff) | |
download | upstream-e327db6d62323855680731cec8275d26df90ce7e.tar.gz upstream-e327db6d62323855680731cec8275d26df90ce7e.tar.bz2 upstream-e327db6d62323855680731cec8275d26df90ce7e.zip |
ath9k: add some cleanup patches and rework tx power handling
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28253 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/531-ath9k_cur_txpower.patch')
-rw-r--r-- | package/mac80211/patches/531-ath9k_cur_txpower.patch | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/package/mac80211/patches/531-ath9k_cur_txpower.patch b/package/mac80211/patches/531-ath9k_cur_txpower.patch index 9a2ce9e43a..894d780420 100644 --- a/package/mac80211/patches/531-ath9k_cur_txpower.patch +++ b/package/mac80211/patches/531-ath9k_cur_txpower.patch @@ -17,19 +17,3 @@ } if (disable_radio) { ---- a/drivers/net/wireless/ath/ath9k/common.c -+++ b/drivers/net/wireless/ath/ath9k/common.c -@@ -161,10 +161,12 @@ EXPORT_SYMBOL(ath9k_cmn_count_streams); - void ath9k_cmn_update_txpow(struct ath_hw *ah, u16 cur_txpow, - u16 new_txpow, u16 *txpower) - { -+ struct ath_regulatory *reg = ath9k_hw_regulatory(ah); -+ - if (cur_txpow != new_txpow) { - ath9k_hw_set_txpowerlimit(ah, new_txpow, false); - /* read back in case value is clamped */ -- *txpower = ath9k_hw_regulatory(ah)->power_limit; -+ *txpower = min_t(u16, reg->power_limit, reg->max_power_level); - } - } - EXPORT_SYMBOL(ath9k_cmn_update_txpow); |