aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/520-mac80211_cur_txpower.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-09-08 09:38:32 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-09-08 09:38:32 +0000
commit249c39658335ea2a1e5cd2edab27970a4db19d66 (patch)
treed377ba708ed048f955b5a97d36808076bd0c2cf2 /package/kernel/mac80211/patches/520-mac80211_cur_txpower.patch
parentf39f07cd09c6b4cdfba71d006ad82ba71bd31328 (diff)
downloadupstream-249c39658335ea2a1e5cd2edab27970a4db19d66.tar.gz
upstream-249c39658335ea2a1e5cd2edab27970a4db19d66.tar.bz2
upstream-249c39658335ea2a1e5cd2edab27970a4db19d66.zip
mac80211: merge a big batch of upstream changes/improvements
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 37918
Diffstat (limited to 'package/kernel/mac80211/patches/520-mac80211_cur_txpower.patch')
-rw-r--r--package/kernel/mac80211/patches/520-mac80211_cur_txpower.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/kernel/mac80211/patches/520-mac80211_cur_txpower.patch b/package/kernel/mac80211/patches/520-mac80211_cur_txpower.patch
index 56e956ae66..dc848774d4 100644
--- a/package/kernel/mac80211/patches/520-mac80211_cur_txpower.patch
+++ b/package/kernel/mac80211/patches/520-mac80211_cur_txpower.patch
@@ -1,6 +1,6 @@
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
-@@ -1617,6 +1617,7 @@ struct ieee80211_hw {
+@@ -1622,6 +1622,7 @@ struct ieee80211_hw {
u8 max_tx_aggregation_subframes;
u8 offchannel_tx_hw_queue;
u8 radiotap_mcs_details;
@@ -10,7 +10,7 @@
u8 uapsd_queues;
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
-@@ -2273,7 +2273,9 @@ static int ieee80211_get_tx_power(struct
+@@ -2283,7 +2283,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);