aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/521-ath9k_cur_txpower.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-01-14 15:59:28 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-01-14 15:59:28 +0000
commit721059ed00a45bb4d30c6cd3f2cf74c330336982 (patch)
treefbc03b42b71b6a2df4d586f533894eb7ecce0430 /package/mac80211/patches/521-ath9k_cur_txpower.patch
parentfef4cf011078377129ab3e1c2efd7e5f96a7a660 (diff)
downloadupstream-721059ed00a45bb4d30c6cd3f2cf74c330336982.tar.gz
upstream-721059ed00a45bb4d30c6cd3f2cf74c330336982.tar.bz2
upstream-721059ed00a45bb4d30c6cd3f2cf74c330336982.zip
ath9k: fix a soft lockup on smp systems
Backport of r35152 git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@35153 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 d740332de3..14b59e58e7 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
-@@ -1245,6 +1245,8 @@ int ath9k_config(struct ieee80211_hw *hw
+@@ -1244,6 +1244,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
-@@ -1259,6 +1261,7 @@ int ath9k_config(struct ieee80211_hw *hw
+@@ -1258,6 +1260,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);