aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/521-ath9k_cur_txpower.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-01-09 12:56:25 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-01-09 12:56:25 +0000
commit3d243e744ee027fc91d8e99165ff05cc79556b2d (patch)
tree0f12df084c4f77c45b568ce4154e225dbec77abe /package/mac80211/patches/521-ath9k_cur_txpower.patch
parent83842c1fc6a87d97c78d7e04125f5727959ef107 (diff)
downloadupstream-3d243e744ee027fc91d8e99165ff05cc79556b2d.tar.gz
upstream-3d243e744ee027fc91d8e99165ff05cc79556b2d.tar.bz2
upstream-3d243e744ee027fc91d8e99165ff05cc79556b2d.zip
mac80211, ath9k: merge some pending fixes from linux-wireless@
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35066 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/521-ath9k_cur_txpower.patch')
-rw-r--r--package/mac80211/patches/521-ath9k_cur_txpower.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/mac80211/patches/521-ath9k_cur_txpower.patch b/package/mac80211/patches/521-ath9k_cur_txpower.patch
index e1ef90f524..294e3dd99d 100644
--- a/package/mac80211/patches/521-ath9k_cur_txpower.patch
+++ b/package/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
-@@ -1199,6 +1199,8 @@ int ath9k_config(struct ieee80211_hw *hw
+@@ -1193,6 +1193,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
-@@ -1213,6 +1215,7 @@ int ath9k_config(struct ieee80211_hw *hw
+@@ -1207,6 +1209,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);