summaryrefslogtreecommitdiff
path: root/package/mac80211/patches/531-ath9k_cur_txpower.patch
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-11-18 11:27:19 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-11-18 11:27:19 +0000
commite194f60a49979616867b44d249156e37728b3cbd (patch)
tree5366708341c61ef88965c36fb8e15bdd4088cd3a /package/mac80211/patches/531-ath9k_cur_txpower.patch
parentcaca8eaab1ec72f135f2880df269629e559f87f1 (diff)
mac80211: update to wireless-testing 2011-11-15
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29240 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/531-ath9k_cur_txpower.patch')
-rw-r--r--package/mac80211/patches/531-ath9k_cur_txpower.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/package/mac80211/patches/531-ath9k_cur_txpower.patch b/package/mac80211/patches/531-ath9k_cur_txpower.patch
index 0c044abb1a..a8eb8a6cf3 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
-@@ -1727,6 +1727,8 @@ static int ath9k_config(struct ieee80211
+@@ -1684,6 +1684,8 @@ static int ath9k_config(struct ieee80211
return -EINVAL;
}
@@ -9,11 +9,11 @@
/*
* The most recent snapshot of channel->noisefloor for the old
* channel is only available after the hardware reset. Copy it to
-@@ -1744,6 +1746,7 @@ static int ath9k_config(struct ieee80211
+@@ -1699,6 +1701,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);
- ath9k_ps_restore(sc);
+ conf->cur_power_level = sc->curtxpow / 2;
}
- if (disable_radio) {
+ mutex_unlock(&sc->mutex);