summaryrefslogtreecommitdiff
path: root/package/kernel/mac80211/patches/521-ath9k_cur_txpower.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-09-08 09:38:32 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-09-08 09:38:32 +0000
commit249c39658335ea2a1e5cd2edab27970a4db19d66 (patch)
treed377ba708ed048f955b5a97d36808076bd0c2cf2 /package/kernel/mac80211/patches/521-ath9k_cur_txpower.patch
parentf39f07cd09c6b4cdfba71d006ad82ba71bd31328 (diff)
downloadmtk-20170518-249c39658335ea2a1e5cd2edab27970a4db19d66.zip
mtk-20170518-249c39658335ea2a1e5cd2edab27970a4db19d66.tar.gz
mtk-20170518-249c39658335ea2a1e5cd2edab27970a4db19d66.tar.bz2
mac80211: merge a big batch of upstream changes/improvements
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 37918
Diffstat (limited to 'package/kernel/mac80211/patches/521-ath9k_cur_txpower.patch')
-rw-r--r--package/kernel/mac80211/patches/521-ath9k_cur_txpower.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/kernel/mac80211/patches/521-ath9k_cur_txpower.patch b/package/kernel/mac80211/patches/521-ath9k_cur_txpower.patch
index 9167903..2aaee2f 100644
--- a/package/kernel/mac80211/patches/521-ath9k_cur_txpower.patch
+++ b/package/kernel/mac80211/patches/521-ath9k_cur_txpower.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -1269,6 +1269,8 @@ int ath9k_config(struct ieee80211_hw *hw
+@@ -1263,6 +1263,8 @@ int ath9k_config(struct ieee80211_hw *hw
return -EINVAL;
}
@@ -9,7 +9,7 @@
/*
* The most recent snapshot of channel->noisefloor for the old
* channel is only available after the hardware reset. Copy it to
-@@ -1305,6 +1307,7 @@ int ath9k_config(struct ieee80211_hw *hw
+@@ -1299,6 +1301,7 @@ int ath9k_config(struct ieee80211_hw *hw
sc->config.txpowlimit = 2 * conf->power_level;
ath9k_cmn_update_txpow(ah, sc->curtxpow,
sc->config.txpowlimit, &sc->curtxpow);