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/520-mac80211_cur_txpower.patch | |
| parent | 7467c1380b0aa1d287b9cecacab7351a65696da8 (diff) | |
| download | master-187ad058-da032a4fe0515a97dbad6a0f18e20c058062d38c.tar.gz master-187ad058-da032a4fe0515a97dbad6a0f18e20c058062d38c.tar.bz2 master-187ad058-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/520-mac80211_cur_txpower.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/520-mac80211_cur_txpower.patch | 4 |
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); |