diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-09-08 09:38:32 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-09-08 09:38:32 +0000 |
| commit | da032a4fe0515a97dbad6a0f18e20c058062d38c (patch) | |
| tree | 8d99340add217d9831810232b418635ccfaf8287 /package/kernel/mac80211/patches/521-ath9k_cur_txpower.patch | |
| parent | 7467c1380b0aa1d287b9cecacab7351a65696da8 (diff) | |
| download | upstream-da032a4fe0515a97dbad6a0f18e20c058062d38c.tar.gz upstream-da032a4fe0515a97dbad6a0f18e20c058062d38c.tar.bz2 upstream-da032a4fe0515a97dbad6a0f18e20c058062d38c.zip | |
mac80211: merge a big batch of upstream changes/improvements
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37918 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.patch | 4 |
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 9167903f1c..2aaee2f393 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 -@@ -1269,6 +1269,8 @@ int ath9k_config(struct ieee80211_hw *hw +@@ -1263,6 +1263,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 -@@ -1305,6 +1307,7 @@ int ath9k_config(struct ieee80211_hw *hw +@@ -1299,6 +1301,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); |