diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-09-08 09:38:38 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-09-08 09:38:38 +0000 |
| commit | 768e6750d77438bb461c5396f205df8b7f56de94 (patch) | |
| tree | d33abf868f9e6ffa0533e859dd338906085943ae /package/kernel/mac80211/patches/521-ath9k_cur_txpower.patch | |
| parent | 249c39658335ea2a1e5cd2edab27970a4db19d66 (diff) | |
| download | upstream-768e6750d77438bb461c5396f205df8b7f56de94.tar.gz upstream-768e6750d77438bb461c5396f205df8b7f56de94.tar.bz2 upstream-768e6750d77438bb461c5396f205df8b7f56de94.zip | |
ath9k: clean up some patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 37919
Diffstat (limited to 'package/kernel/mac80211/patches/521-ath9k_cur_txpower.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/521-ath9k_cur_txpower.patch | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/package/kernel/mac80211/patches/521-ath9k_cur_txpower.patch b/package/kernel/mac80211/patches/521-ath9k_cur_txpower.patch index 2aaee2f393..22691910fe 100644 --- a/package/kernel/mac80211/patches/521-ath9k_cur_txpower.patch +++ b/package/kernel/mac80211/patches/521-ath9k_cur_txpower.patch @@ -1,15 +1,20 @@ --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c -@@ -1263,6 +1263,8 @@ int ath9k_config(struct ieee80211_hw *hw - return -EINVAL; - } +@@ -286,8 +286,12 @@ static int ath_reset_internal(struct ath + (sc->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)) + ath9k_mci_set_txpower(sc, true, false); -+ hw->cur_power_level = sc->curtxpow / 2; +- if (!ath_complete_reset(sc, true)) ++ if (!ath_complete_reset(sc, true)) { + r = -EIO; ++ goto out; ++ } + - /* - * The most recent snapshot of channel->noisefloor for the old - * channel is only available after the hardware reset. Copy it to -@@ -1299,6 +1301,7 @@ int ath9k_config(struct ieee80211_hw *hw ++ sc->hw->cur_power_level = sc->curtxpow / 2; + + out: + spin_unlock_bh(&sc->sc_pcu_lock); +@@ -1299,6 +1303,7 @@ static int ath9k_config(struct ieee80211 sc->config.txpowlimit = 2 * conf->power_level; ath9k_cmn_update_txpow(ah, sc->curtxpow, sc->config.txpowlimit, &sc->curtxpow); |