aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/521-ath9k_cur_txpower.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-08-06 10:31:10 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-08-06 10:31:10 +0000
commitb51903e2aa7235dba83c17d8b4a87385d45679b8 (patch)
tree9c7954c29fc2f3e5bb461f4ee05fc60e127895f0 /package/kernel/mac80211/patches/521-ath9k_cur_txpower.patch
parent74859a9bff3fdfeaca180cddafcef19a81352bb0 (diff)
downloadmaster-187ad058-b51903e2aa7235dba83c17d8b4a87385d45679b8.tar.gz
master-187ad058-b51903e2aa7235dba83c17d8b4a87385d45679b8.tar.bz2
master-187ad058-b51903e2aa7235dba83c17d8b4a87385d45679b8.zip
ath9k: fold the aggregation rework into 300-pending_work.patch (tracked as upstream submission)
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37716 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 87a316c4f0..9167903f1c 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
-@@ -1258,6 +1258,8 @@ int ath9k_config(struct ieee80211_hw *hw
+@@ -1269,6 +1269,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
-@@ -1294,6 +1296,7 @@ int ath9k_config(struct ieee80211_hw *hw
+@@ -1305,6 +1307,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);