summaryrefslogtreecommitdiff
path: root/package/kernel/mac80211/patches/520-mac80211_cur_txpower.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-09-27 20:51:43 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-09-27 20:51:43 +0000
commit8be721208dad06c6a3119dee2db81c385a91a336 (patch)
tree70eddd3a592f75ebfb105dc619735d0c5178c471 /package/kernel/mac80211/patches/520-mac80211_cur_txpower.patch
parent54a18b3fe80d6cfe06acda47c7d4d82c0d0e5688 (diff)
downloadmtk-20170518-8be721208dad06c6a3119dee2db81c385a91a336.zip
mtk-20170518-8be721208dad06c6a3119dee2db81c385a91a336.tar.gz
mtk-20170518-8be721208dad06c6a3119dee2db81c385a91a336.tar.bz2
mac80211: update to wireless-testing 2014-09-26
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 42683
Diffstat (limited to 'package/kernel/mac80211/patches/520-mac80211_cur_txpower.patch')
-rw-r--r--package/kernel/mac80211/patches/520-mac80211_cur_txpower.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/kernel/mac80211/patches/520-mac80211_cur_txpower.patch b/package/kernel/mac80211/patches/520-mac80211_cur_txpower.patch
index ef7906e..db1e890 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
-@@ -1718,6 +1718,7 @@ struct ieee80211_hw {
+@@ -1754,6 +1754,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
-@@ -2084,7 +2084,9 @@ static int ieee80211_get_tx_power(struct
+@@ -2081,7 +2081,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);
@@ -23,7 +23,7 @@
*dbm = sdata->vif.bss_conf.txpower;
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
-@@ -156,6 +156,7 @@ static u32 ieee80211_hw_conf_chan(struct
+@@ -157,6 +157,7 @@ static u32 ieee80211_hw_conf_chan(struct
if (local->hw.conf.power_level != power) {
changed |= IEEE80211_CONF_CHANGE_POWER;