aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/520-mac80211_cur_txpower.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-04-16 21:08:41 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-04-16 21:08:41 +0000
commite4f208ebf3029f415cf0a79d41ea27fa45c2a62c (patch)
treef3d4a3ace1fce602fa8b9fb1e3c84e817c712d49 /package/mac80211/patches/520-mac80211_cur_txpower.patch
parentc47c2671d413055a8753f2aec429a8d072c5ed9a (diff)
downloadupstream-e4f208ebf3029f415cf0a79d41ea27fa45c2a62c.tar.gz
upstream-e4f208ebf3029f415cf0a79d41ea27fa45c2a62c.tar.bz2
upstream-e4f208ebf3029f415cf0a79d41ea27fa45c2a62c.zip
mac80211: update to wireless-testing 2012-04-13
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31322 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/520-mac80211_cur_txpower.patch')
-rw-r--r--package/mac80211/patches/520-mac80211_cur_txpower.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/package/mac80211/patches/520-mac80211_cur_txpower.patch b/package/mac80211/patches/520-mac80211_cur_txpower.patch
new file mode 100644
index 0000000000..f6dbbef740
--- /dev/null
+++ b/package/mac80211/patches/520-mac80211_cur_txpower.patch
@@ -0,0 +1,32 @@
+--- a/include/net/mac80211.h
++++ b/include/net/mac80211.h
+@@ -825,7 +825,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;
+
+ u16 listen_interval;
+--- a/net/mac80211/cfg.c
++++ b/net/mac80211/cfg.c
+@@ -1738,7 +1738,7 @@ static int ieee80211_get_tx_power(struct
+ {
+ struct ieee80211_local *local = wiphy_priv(wiphy);
+
+- *dbm = local->hw.conf.power_level;
++ *dbm = local->hw.conf.cur_power_level;
+
+ return 0;
+ }
+--- a/net/mac80211/main.c
++++ b/net/mac80211/main.c
+@@ -165,6 +165,7 @@ int ieee80211_hw_config(struct ieee80211
+
+ if (local->hw.conf.power_level != power) {
+ changed |= IEEE80211_CONF_CHANGE_POWER;
++ local->hw.conf.cur_power_level = power;
+ local->hw.conf.power_level = power;
+ }
+