diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-04-26 10:52:03 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-04-26 10:52:03 +0000 |
| commit | accc6e309e9f9ce94ce34c7b2cdf60e16c78d1e1 (patch) | |
| tree | 3b2ebce435696f7f85164376efffbc7758012c20 /package/mac80211/patches/520-mac80211_cur_txpower.patch | |
| parent | bc453a52b2c3b3da4dba056048cb83db195fe189 (diff) | |
| download | upstream-accc6e309e9f9ce94ce34c7b2cdf60e16c78d1e1.tar.gz upstream-accc6e309e9f9ce94ce34c7b2cdf60e16c78d1e1.tar.bz2 upstream-accc6e309e9f9ce94ce34c7b2cdf60e16c78d1e1.zip | |
mac80211: update to wireless-testing 2013-04-16 + backports
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 36448
Diffstat (limited to 'package/mac80211/patches/520-mac80211_cur_txpower.patch')
| -rw-r--r-- | package/mac80211/patches/520-mac80211_cur_txpower.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package/mac80211/patches/520-mac80211_cur_txpower.patch b/package/mac80211/patches/520-mac80211_cur_txpower.patch index f0ed3d944d..80d3c568e1 100644 --- a/package/mac80211/patches/520-mac80211_cur_txpower.patch +++ b/package/mac80211/patches/520-mac80211_cur_txpower.patch @@ -1,16 +1,16 @@ --- a/include/net/mac80211.h +++ b/include/net/mac80211.h -@@ -1554,6 +1554,7 @@ struct ieee80211_hw { +@@ -1605,6 +1605,7 @@ struct ieee80211_hw { u8 max_tx_aggregation_subframes; u8 offchannel_tx_hw_queue; u8 radiotap_mcs_details; + s8 cur_power_level; u16 radiotap_vht_details; netdev_features_t netdev_features; - }; + u8 uapsd_queues; --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c -@@ -2190,7 +2190,9 @@ static int ieee80211_get_tx_power(struct +@@ -2259,7 +2259,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 -@@ -166,6 +166,7 @@ static u32 ieee80211_hw_conf_chan(struct +@@ -167,6 +167,7 @@ static u32 ieee80211_hw_conf_chan(struct if (local->hw.conf.power_level != power) { changed |= IEEE80211_CONF_CHANGE_POWER; |