1 files changed, 38 insertions, 8 deletions

diff --git a/net/mac80211/wext.c b/net/mac80211/wext.c
index 15428048d01a..7162d5816f39 100644
--- a/net/mac80211/wext.c
+++ b/net/mac80211/wext.c
@@ -830,25 +830,56 @@ static int ieee80211_ioctl_siwpower(struct net_device *dev,
                                     struct iw_param *wrq,
                                     char *extra)
 {
+        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
         struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
         struct ieee80211_conf *conf = &local->hw.conf;
+        int ret = 0, timeout = 0;
+        bool ps;
+
+        if (sdata->vif.type != NL80211_IFTYPE_STATION)
+                return -EINVAL;
 
         if (wrq->disabled) {
-                conf->flags &= ~IEEE80211_CONF_PS;
-                return ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_PS);
+                ps = false;
+                timeout = 0;
+                goto set;
         }
 
         switch (wrq->flags & IW_POWER_MODE) {
         case IW_POWER_ON:       /* If not specified */
         case IW_POWER_MODE:     /* If set all mask */
         case IW_POWER_ALL_R:    /* If explicitely state all */
-                conf->flags |= IEEE80211_CONF_PS;
+                ps = true;
+                break;
+        default:                /* Otherwise we ignore */
                 break;
-        default:                /* Otherwise we don't support it */
-                return -EINVAL;
         }
 
-        return ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_PS);
+        if (wrq->flags & IW_POWER_TIMEOUT)
+                timeout = wrq->value / 1000;
+
+set:
+        if (ps == local->powersave && timeout == local->dynamic_ps_timeout)
+                return ret;
+
+        local->powersave = ps;
+        local->dynamic_ps_timeout = timeout;
+
+        if (sdata->u.sta.flags & IEEE80211_STA_ASSOCIATED) {
+                if (!(local->hw.flags & IEEE80211_HW_NO_STACK_DYNAMIC_PS) &&
+                    local->dynamic_ps_timeout > 0)
+                        mod_timer(&local->dynamic_ps_timer, jiffies +
+                                  msecs_to_jiffies(local->dynamic_ps_timeout));
+                else {
+                        if (local->powersave)
+                                conf->flags |= IEEE80211_CONF_PS;
+                        else
+                                conf->flags &= ~IEEE80211_CONF_PS;
+                }
+                ret = ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_PS);
+        }
+
+        return ret;
 }
 
 static int ieee80211_ioctl_giwpower(struct net_device *dev,
@@ -857,9 +888,8 @@ static int ieee80211_ioctl_giwpower(struct net_device *dev,
                                     char *extra)
 {
         struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
-        struct ieee80211_conf *conf = &local->hw.conf;
 
-        wrqu->power.disabled = !(conf->flags & IEEE80211_CONF_PS);
+        wrqu->power.disabled = !local->powersave;
 
         return 0;
 }