From 198408b9242e3c88c3514b82143de65615664e3c Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 28 Sep 2012 18:29:02 +0000 Subject: mac80211: rework the current tx power display patch git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33584 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../mac80211/patches/520-mac80211_cur_txpower.patch | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'package/mac80211/patches/520-mac80211_cur_txpower.patch') 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; } -- cgit v1.2.3