aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/531-ath9k_cur_txpower.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-08-13 16:25:15 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-08-13 16:25:15 +0000
commitf681253412cc84e5b60eb54448f0768ecaa6881a (patch)
treed3dfe00b5f93c683666519daa6d6e144d8801fe7 /package/mac80211/patches/531-ath9k_cur_txpower.patch
parent757a0d47b7eeb80d47e14690d49ff3b3999abd32 (diff)
downloadupstream-f681253412cc84e5b60eb54448f0768ecaa6881a.tar.gz
upstream-f681253412cc84e5b60eb54448f0768ecaa6881a.tar.bz2
upstream-f681253412cc84e5b60eb54448f0768ecaa6881a.zip
ath9k: merge a few more pending fixes, including a fix for the bogus WARN_ON in pci.c and fixes for Rx DMA stop issues
SVN-Revision: 27972
Diffstat (limited to 'package/mac80211/patches/531-ath9k_cur_txpower.patch')
-rw-r--r--package/mac80211/patches/531-ath9k_cur_txpower.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/mac80211/patches/531-ath9k_cur_txpower.patch b/package/mac80211/patches/531-ath9k_cur_txpower.patch
index 3c0a466756..26085c1301 100644
--- a/package/mac80211/patches/531-ath9k_cur_txpower.patch
+++ b/package/mac80211/patches/531-ath9k_cur_txpower.patch
@@ -1,6 +1,6 @@
--- 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
+@@ -1736,6 +1736,8 @@ static int ath9k_config(struct ieee80211
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
-@@ -1748,6 +1750,7 @@ static int ath9k_config(struct ieee80211
+@@ -1753,6 +1755,7 @@ static int ath9k_config(struct ieee80211
ath9k_cmn_update_txpow(ah, sc->curtxpow,
sc->config.txpowlimit, &sc->curtxpow);
ath9k_ps_restore(sc);