5 files changed, 20 insertions, 15 deletions

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 76537f103872..83ee8a212296 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -515,6 +515,7 @@ static inline int __deprecated __IEEE80211_CONF_SHORT_SLOT_TIME(void)
  * @IEEE80211_CONF_CHANGE_LISTEN_INTERVAL: the listen interval changed
  * @IEEE80211_CONF_CHANGE_RADIOTAP: the radiotap flag changed
  * @IEEE80211_CONF_CHANGE_PS: the PS flag changed
+ * @IEEE80211_CONF_CHANGE_DYNPS_TIMEOUT: the dynamic PS timeout changed
  * @IEEE80211_CONF_CHANGE_POWER: the TX power changed
  * @IEEE80211_CONF_CHANGE_CHANNEL: the channel/channel_type changed
  * @IEEE80211_CONF_CHANGE_RETRY_LIMITS: retry limits changed
@@ -525,9 +526,10 @@ enum ieee80211_conf_changed {
         IEEE80211_CONF_CHANGE_LISTEN_INTERVAL   = BIT(2),
         IEEE80211_CONF_CHANGE_RADIOTAP          = BIT(3),
         IEEE80211_CONF_CHANGE_PS                = BIT(4),
-        IEEE80211_CONF_CHANGE_POWER             = BIT(5),
-        IEEE80211_CONF_CHANGE_CHANNEL           = BIT(6),
-        IEEE80211_CONF_CHANGE_RETRY_LIMITS      = BIT(7),
+        IEEE80211_CONF_CHANGE_DYNPS_TIMEOUT     = BIT(5),
+        IEEE80211_CONF_CHANGE_POWER             = BIT(6),
+        IEEE80211_CONF_CHANGE_CHANNEL           = BIT(7),
+        IEEE80211_CONF_CHANGE_RETRY_LIMITS      = BIT(8),
 };
 
 /**
@@ -540,6 +542,7 @@ enum ieee80211_conf_changed {
  * @listen_interval: listen interval in units of beacon interval
  * @flags: configuration flags defined above
  * @power_level: requested transmit power (in dBm)
+ * @dynamic_ps_timeout: dynamic powersave timeout (in ms)
  * @channel: the channel to tune to
  * @channel_type: the channel (HT) type
  * @long_frame_max_tx_count: Maximum number of transmissions for a "long" frame
@@ -552,7 +555,7 @@ enum ieee80211_conf_changed {
 struct ieee80211_conf {
         int beacon_int;
         u32 flags;
-        int power_level;
+        int power_level, dynamic_ps_timeout;
 
         u16 listen_interval;
         bool radio_enabled;
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index fa5ca14517f5..3db6bc3cdaf2 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -700,7 +700,6 @@ struct ieee80211_local {
         unsigned int wmm_acm; /* bit field of ACM bits (BIT(802.1D tag)) */
 
         bool powersave;
-        int dynamic_ps_timeout;
         struct work_struct dynamic_ps_enable_work;
         struct work_struct dynamic_ps_disable_work;
         struct timer_list dynamic_ps_timer;
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 6a90171c859f..7709e7645671 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -777,9 +777,10 @@ static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata,
 
         if (local->powersave &&
                         !(local->hw.flags & IEEE80211_HW_NO_STACK_DYNAMIC_PS)) {
-                if (local->dynamic_ps_timeout > 0)
+                if (local->hw.conf.dynamic_ps_timeout > 0)
                         mod_timer(&local->dynamic_ps_timer, jiffies +
-                                  msecs_to_jiffies(local->dynamic_ps_timeout));
+                                  msecs_to_jiffies(
+                                        local->hw.conf.dynamic_ps_timeout));
                 else {
                         ieee80211_send_nullfunc(local, sdata, 1);
                         conf->flags |= IEEE80211_CONF_PS;
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 96eca341160b..b18a72690119 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1296,7 +1296,7 @@ int ieee80211_master_start_xmit(struct sk_buff *skb, struct net_device *dev)
         }
 
         if (!(local->hw.flags & IEEE80211_HW_NO_STACK_DYNAMIC_PS) &&
-            local->dynamic_ps_timeout > 0) {
+            local->hw.conf.dynamic_ps_timeout > 0) {
                 if (local->hw.conf.flags & IEEE80211_CONF_PS) {
                         ieee80211_stop_queues_by_reason(&local->hw,
                                         IEEE80211_QUEUE_STOP_REASON_PS);
@@ -1305,7 +1305,7 @@ int ieee80211_master_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 }
 
                 mod_timer(&local->dynamic_ps_timer, jiffies +
-                                msecs_to_jiffies(local->dynamic_ps_timeout));
+                        msecs_to_jiffies(local->hw.conf.dynamic_ps_timeout));
         }
 
         memset(info, 0, sizeof(*info));
diff --git a/net/mac80211/wext.c b/net/mac80211/wext.c
index 3fc1b903bfbc..3f2db0bda46c 100644
--- a/net/mac80211/wext.c
+++ b/net/mac80211/wext.c
@@ -863,17 +863,19 @@ static int ieee80211_ioctl_siwpower(struct net_device *dev,
                 timeout = wrq->value / 1000;
 
 set:
-        if (ps == local->powersave && timeout == local->dynamic_ps_timeout)
+        if (ps == local->powersave && timeout == conf->dynamic_ps_timeout)
                 return ret;
 
         local->powersave = ps;
-        local->dynamic_ps_timeout = timeout;
+        conf->dynamic_ps_timeout = timeout;
 
-        if (!(local->hw.flags & IEEE80211_HW_NO_STACK_DYNAMIC_PS) &&
-                        (sdata->u.sta.flags & IEEE80211_STA_ASSOCIATED)) {
-                if (local->dynamic_ps_timeout > 0)
+        if (local->hw.flags & IEEE80211_HW_NO_STACK_DYNAMIC_PS) {
+                ret = ieee80211_hw_config(local,
+                                          IEEE80211_CONF_CHANGE_DYNPS_TIMEOUT);
+        } else if (sdata->u.sta.flags & IEEE80211_STA_ASSOCIATED) {
+                if (conf->dynamic_ps_timeout > 0)
                         mod_timer(&local->dynamic_ps_timer, jiffies +
-                                  msecs_to_jiffies(local->dynamic_ps_timeout));
+                                  msecs_to_jiffies(conf->dynamic_ps_timeout));
                 else {
                         if (local->powersave) {
                                 ieee80211_send_nullfunc(local, sdata, 1);