diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-09-27 20:51:43 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-09-27 20:51:43 +0000 |
| commit | 8be721208dad06c6a3119dee2db81c385a91a336 (patch) | |
| tree | 70eddd3a592f75ebfb105dc619735d0c5178c471 /package/kernel/mac80211/patches/521-ath9k_cur_txpower.patch | |
| parent | 54a18b3fe80d6cfe06acda47c7d4d82c0d0e5688 (diff) | |
| download | mtk-20170518-8be721208dad06c6a3119dee2db81c385a91a336.zip mtk-20170518-8be721208dad06c6a3119dee2db81c385a91a336.tar.gz mtk-20170518-8be721208dad06c6a3119dee2db81c385a91a336.tar.bz2 | |
mac80211: update to wireless-testing 2014-09-26
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 42683
Diffstat (limited to 'package/kernel/mac80211/patches/521-ath9k_cur_txpower.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/521-ath9k_cur_txpower.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/package/kernel/mac80211/patches/521-ath9k_cur_txpower.patch b/package/kernel/mac80211/patches/521-ath9k_cur_txpower.patch index 83ff465..9c16d59 100644 --- a/package/kernel/mac80211/patches/521-ath9k_cur_txpower.patch +++ b/package/kernel/mac80211/patches/521-ath9k_cur_txpower.patch @@ -1,7 +1,7 @@ --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c -@@ -310,8 +310,12 @@ static int ath_reset_internal(struct ath - (sc->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)) +@@ -323,8 +323,12 @@ int ath_reset_internal(struct ath_softc + sc->cur_chan->offchannel) ath9k_mci_set_txpower(sc, true, false); - if (!ath_complete_reset(sc, true)) @@ -14,10 +14,10 @@ out: spin_unlock_bh(&sc->sc_pcu_lock); -@@ -1405,6 +1409,7 @@ static int ath9k_config(struct ieee80211 - sc->config.txpowlimit = 2 * conf->power_level; +@@ -1453,6 +1457,7 @@ static int ath9k_config(struct ieee80211 + sc->cur_chan->txpower = 2 * conf->power_level; ath9k_cmn_update_txpow(ah, sc->curtxpow, - sc->config.txpowlimit, &sc->curtxpow); + sc->cur_chan->txpower, &sc->curtxpow); + hw->cur_power_level = sc->curtxpow / 2; } |