diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-09-28 18:29:02 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-09-28 18:29:02 +0000 |
| commit | aef9e61b32ef2ff005c13347c893da5f1ed8dd67 (patch) | |
| tree | 63f671d3dbba33d38270617a24a8eedbdf7b3f9c /package/mac80211/patches/520-mac80211_cur_txpower.patch | |
| parent | d3add1f103b1870a7263b0037873b696bc726cec (diff) | |
| download | upstream-aef9e61b32ef2ff005c13347c893da5f1ed8dd67.tar.gz upstream-aef9e61b32ef2ff005c13347c893da5f1ed8dd67.tar.bz2 upstream-aef9e61b32ef2ff005c13347c893da5f1ed8dd67.zip | |
mac80211: rework the current tx power display patch
SVN-Revision: 33584
Diffstat (limited to 'package/mac80211/patches/520-mac80211_cur_txpower.patch')
| -rw-r--r-- | package/mac80211/patches/520-mac80211_cur_txpower.patch | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/package/mac80211/patches/520-mac80211_cur_txpower.patch b/package/mac80211/patches/520-mac80211_cur_txpower.patch index 3a22a1ad35..1b7348c08b 100644 --- a/package/mac80211/patches/520-mac80211_cur_txpower.patch +++ b/package/mac80211/patches/520-mac80211_cur_txpower.patch @@ -1,14 +1,13 @@ --- a/include/net/mac80211.h +++ b/include/net/mac80211.h -@@ -863,7 +863,7 @@ enum ieee80211_smps_mode { - */ - struct ieee80211_conf { - u32 flags; -- int power_level, dynamic_ps_timeout; -+ int cur_power_level, power_level, dynamic_ps_timeout; - int max_sleep_period; +@@ -1372,6 +1372,7 @@ struct ieee80211_hw { + u8 max_tx_aggregation_subframes; + u8 offchannel_tx_hw_queue; + u8 radiotap_mcs_details; ++ s8 cur_power_level; + netdev_features_t netdev_features; + }; - u16 listen_interval; --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -1969,7 +1969,7 @@ static int ieee80211_get_tx_power(struct @@ -16,7 +15,7 @@ struct ieee80211_local *local = wiphy_priv(wiphy); - *dbm = local->hw.conf.power_level; -+ *dbm = local->hw.conf.cur_power_level; ++ *dbm = local->hw.cur_power_level; return 0; } @@ -26,7 +25,7 @@ if (local->hw.conf.power_level != power) { changed |= IEEE80211_CONF_CHANGE_POWER; -+ local->hw.conf.cur_power_level = power; ++ local->hw.cur_power_level = power; local->hw.conf.power_level = power; } |