diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-08-11 13:52:27 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2011-08-11 13:52:27 +0000 |
| commit | 400f75a1b657eceb5e661adb5bf56c2498b4a2ff (patch) | |
| tree | 1d85da294b86812834c0c0ba2c7ef076e866bbdb /package/mac80211/patches/531-ath9k_cur_txpower.patch | |
| parent | ce2ced73118dfd1dab21392f91cda19f005f949d (diff) | |
| download | upstream-400f75a1b657eceb5e661adb5bf56c2498b4a2ff.tar.gz upstream-400f75a1b657eceb5e661adb5bf56c2498b4a2ff.tar.bz2 upstream-400f75a1b657eceb5e661adb5bf56c2498b4a2ff.zip | |
mac80211: update to 2011-08-10
SVN-Revision: 27958
Diffstat (limited to 'package/mac80211/patches/531-ath9k_cur_txpower.patch')
| -rw-r--r-- | package/mac80211/patches/531-ath9k_cur_txpower.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/package/mac80211/patches/531-ath9k_cur_txpower.patch b/package/mac80211/patches/531-ath9k_cur_txpower.patch new file mode 100644 index 0000000000..3c0a466756 --- /dev/null +++ b/package/mac80211/patches/531-ath9k_cur_txpower.patch @@ -0,0 +1,35 @@ +--- a/drivers/net/wireless/ath/ath9k/main.c ++++ b/drivers/net/wireless/ath/ath9k/main.c +@@ -1731,6 +1731,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 +@@ -1748,6 +1750,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); |