diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-12-07 16:46:04 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-12-07 16:46:04 +0000 |
| commit | 6716ba9aadc93b2858ab800a84cb4335c92324ff (patch) | |
| tree | 8f8fbea06486b2e23eb4be46d92b4b0f121e831c /package/mac80211/patches/520-mac80211_cur_txpower.patch | |
| parent | 3365e2caf014e24ff8ea091a3d93cb89f330b70b (diff) | |
| download | master-31e0f0ae-6716ba9aadc93b2858ab800a84cb4335c92324ff.tar.gz master-31e0f0ae-6716ba9aadc93b2858ab800a84cb4335c92324ff.tar.bz2 master-31e0f0ae-6716ba9aadc93b2858ab800a84cb4335c92324ff.zip | |
mac80211: update to wireless-testing 2012-12-06
SVN-Revision: 34571
Diffstat (limited to 'package/mac80211/patches/520-mac80211_cur_txpower.patch')
| -rw-r--r-- | package/mac80211/patches/520-mac80211_cur_txpower.patch | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/package/mac80211/patches/520-mac80211_cur_txpower.patch b/package/mac80211/patches/520-mac80211_cur_txpower.patch index 54f2e5040b..48ded53dd8 100644 --- a/package/mac80211/patches/520-mac80211_cur_txpower.patch +++ b/package/mac80211/patches/520-mac80211_cur_txpower.patch @@ -1,27 +1,29 @@ --- a/include/net/mac80211.h +++ b/include/net/mac80211.h -@@ -1372,6 +1372,7 @@ struct ieee80211_hw { +@@ -1508,6 +1508,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; }; - --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c -@@ -1967,7 +1967,7 @@ static int ieee80211_get_tx_power(struct - { +@@ -2096,7 +2096,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); -- *dbm = local->hw.conf.power_level; -+ *dbm = local->hw.cur_power_level; - - return 0; - } +- if (!local->use_chanctx) ++ if (local->hw.cur_power_level) ++ *dbm = local->hw.cur_power_level; ++ else if (!local->use_chanctx) + *dbm = local->hw.conf.power_level; + else + *dbm = sdata->vif.bss_conf.txpower; --- a/net/mac80211/main.c +++ b/net/mac80211/main.c -@@ -165,6 +165,7 @@ int ieee80211_hw_config(struct ieee80211 +@@ -167,6 +167,7 @@ static u32 ieee80211_hw_conf_chan(struct if (local->hw.conf.power_level != power) { changed |= IEEE80211_CONF_CHANGE_POWER; |