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/595-ath9k_cur_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/595-ath9k_cur_txpower.patch')
| -rw-r--r-- | package/mac80211/patches/595-ath9k_cur_txpower.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/package/mac80211/patches/595-ath9k_cur_txpower.patch b/package/mac80211/patches/595-ath9k_cur_txpower.patch deleted file mode 100644 index 7bc92f13eb..0000000000 --- a/package/mac80211/patches/595-ath9k_cur_txpower.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- a/drivers/net/wireless/ath/ath9k/main.c -+++ b/drivers/net/wireless/ath/ath9k/main.c -@@ -1727,6 +1727,8 @@ static int ath9k_config(struct ieee80211 - return -EINVAL; - } - -+ conf->cur_power_level = sc->curtxpow / 2; -+ - /* - * The most recent snapshot of channel->noisefloor for the old - * channel is only available after the hardware reset. Copy it to -@@ -1744,6 +1746,7 @@ static int ath9k_config(struct ieee80211 - ath9k_cmn_update_txpow(ah, sc->curtxpow, - sc->config.txpowlimit, &sc->curtxpow); - ath9k_ps_restore(sc); -+ conf->cur_power_level = sc->curtxpow / 2; - } - - 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); |