diff options
author | Felix Fietkau <nbd@openwrt.org> | 2014-09-27 20:51:43 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2014-09-27 20:51:43 +0000 |
commit | dd8008aa78bed570c903cc167ba16591f246da78 (patch) | |
tree | 41e7adc38cd141c1e46de42d5ad433e6436e048d /package/kernel/mac80211/patches/520-mac80211_cur_txpower.patch | |
parent | 634e6c6b9ae7ed82ab8d95da8f2a596534534111 (diff) | |
download | upstream-dd8008aa78bed570c903cc167ba16591f246da78.tar.gz upstream-dd8008aa78bed570c903cc167ba16591f246da78.tar.bz2 upstream-dd8008aa78bed570c903cc167ba16591f246da78.zip |
mac80211: update to wireless-testing 2014-09-26
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42683 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.patch | 6 |
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 ef7906e647..db1e89069e 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; |