diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-08-01 12:15:15 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2011-08-01 12:15:15 +0000 |
| commit | a1e19186fa70e8bc918d825e31a50259ea8082fd (patch) | |
| tree | 7e08fcb20003dd62c1286426a50e8504e081e5db /package/mac80211/patches/550-mac80211_cur_txpower.patch | |
| parent | 478decc60bb34144cc60b61c27378d8b0a0dce9b (diff) | |
| download | upstream-a1e19186fa70e8bc918d825e31a50259ea8082fd.tar.gz upstream-a1e19186fa70e8bc918d825e31a50259ea8082fd.tar.bz2 upstream-a1e19186fa70e8bc918d825e31a50259ea8082fd.zip | |
ath9k: fold patches that were merged upstream into 300-pending_work.patch
SVN-Revision: 27860
Diffstat (limited to 'package/mac80211/patches/550-mac80211_cur_txpower.patch')
| -rw-r--r-- | package/mac80211/patches/550-mac80211_cur_txpower.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/package/mac80211/patches/550-mac80211_cur_txpower.patch b/package/mac80211/patches/550-mac80211_cur_txpower.patch new file mode 100644 index 0000000000..8e729c1a44 --- /dev/null +++ b/package/mac80211/patches/550-mac80211_cur_txpower.patch @@ -0,0 +1,32 @@ +--- a/include/net/mac80211.h ++++ b/include/net/mac80211.h +@@ -779,7 +779,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 +@@ -1524,7 +1524,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 +@@ -210,6 +210,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; + } + |