mac80211: update to 2011-11-15 from trunk
[openwrt-10.03/.git] / package / mac80211 / patches / 530-mac80211_cur_txpower.patch
1 --- a/include/net/mac80211.h
2 +++ b/include/net/mac80211.h
3 @@ -816,7 +816,7 @@ enum ieee80211_smps_mode {
4   */
5  struct ieee80211_conf {
6         u32 flags;
7 -       int power_level, dynamic_ps_timeout;
8 +       int cur_power_level, power_level, dynamic_ps_timeout;
9         int max_sleep_period;
10  
11         u16 listen_interval;
12 --- a/net/mac80211/cfg.c
13 +++ b/net/mac80211/cfg.c
14 @@ -1677,7 +1677,7 @@ static int ieee80211_get_tx_power(struct
15  {
16         struct ieee80211_local *local = wiphy_priv(wiphy);
17  
18 -       *dbm = local->hw.conf.power_level;
19 +       *dbm = local->hw.conf.cur_power_level;
20  
21         return 0;
22  }
23 --- a/net/mac80211/main.c
24 +++ b/net/mac80211/main.c
25 @@ -208,6 +208,7 @@ int ieee80211_hw_config(struct ieee80211
26  
27         if (local->hw.conf.power_level != power) {
28                 changed |= IEEE80211_CONF_CHANGE_POWER;
29 +               local->hw.conf.cur_power_level = power;
30                 local->hw.conf.power_level = power;
31         }
32