diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-08-01 12:15:15 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-08-01 12:15:15 +0000 |
| commit | 99a41c0ace85fce0efca7bedd39d0c88429fdc12 (patch) | |
| tree | 88aa050ff0bbb96dbd78955e42fcc1b26ee5c800 /package/mac80211/patches/590-mac80211_cur_txpower.patch | |
| parent | 4371be6c65c16464d42c70ebabc476f036618166 (diff) | |
ath9k: fold patches that were merged upstream into 300-pending_work.patch
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27860 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/590-mac80211_cur_txpower.patch')
| -rw-r--r-- | package/mac80211/patches/590-mac80211_cur_txpower.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/package/mac80211/patches/590-mac80211_cur_txpower.patch b/package/mac80211/patches/590-mac80211_cur_txpower.patch deleted file mode 100644 index 8e729c1a44..0000000000 --- a/package/mac80211/patches/590-mac80211_cur_txpower.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- 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; - } - |