aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/520-mac80211_cur_txpower.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-06-05 14:55:07 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-06-05 14:55:07 +0000
commita7e6fe68917176242a3436e9ed03dd07cb3e8376 (patch)
treea65543f44690075a0d0073f70323289e568b8fac /package/kernel/mac80211/patches/520-mac80211_cur_txpower.patch
parent97dbd21bf8dbce81a374c5416be45a17064f3af6 (diff)
downloadupstream-a7e6fe68917176242a3436e9ed03dd07cb3e8376.tar.gz
upstream-a7e6fe68917176242a3436e9ed03dd07cb3e8376.tar.bz2
upstream-a7e6fe68917176242a3436e9ed03dd07cb3e8376.zip
mac80211: merge a series of cleanups/fixes
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41018 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211/patches/520-mac80211_cur_txpower.patch')
-rw-r--r--package/kernel/mac80211/patches/520-mac80211_cur_txpower.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/package/kernel/mac80211/patches/520-mac80211_cur_txpower.patch b/package/kernel/mac80211/patches/520-mac80211_cur_txpower.patch
index 68320a0b15..ef7906e647 100644
--- a/package/kernel/mac80211/patches/520-mac80211_cur_txpower.patch
+++ b/package/kernel/mac80211/patches/520-mac80211_cur_txpower.patch
@@ -10,7 +10,7 @@
u8 uapsd_queues;
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
-@@ -2391,7 +2391,9 @@ static int ieee80211_get_tx_power(struct
+@@ -2084,7 +2084,9 @@ static int ieee80211_get_tx_power(struct
struct ieee80211_local *local = wiphy_priv(wiphy);
struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);