4 files changed, 15 insertions, 14 deletions

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 59f597d0c6a0..003b6addf5fa 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1446,7 +1446,6 @@ static int ieee80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *dev,
 {
         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;
 
         if (sdata->vif.type != NL80211_IFTYPE_STATION)
                 return -EOPNOTSUPP;
@@ -1455,11 +1454,11 @@ static int ieee80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *dev,
                 return -EOPNOTSUPP;
 
         if (enabled == sdata->u.mgd.powersave &&
-            timeout == conf->dynamic_ps_forced_timeout)
+            timeout == local->dynamic_ps_forced_timeout)
                 return 0;
 
         sdata->u.mgd.powersave = enabled;
-        conf->dynamic_ps_forced_timeout = timeout;
+        local->dynamic_ps_forced_timeout = timeout;
 
         /* no change, but if automatic follow powersave */
         mutex_lock(&sdata->u.mgd.mtx);
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 9b3c3f971d28..fb5430188e87 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -850,6 +850,12 @@ struct ieee80211_local {
         struct notifier_block network_latency_notifier;
         struct notifier_block ifa_notifier;
 
+        /*
+         * The dynamic ps timeout configured from user space via WEXT -
+         * this will override whatever chosen by mac80211 internally.
+         */
+        int dynamic_ps_forced_timeout;
+
         int user_power_level; /* in dBm */
         int power_constr_level; /* in dBm */
 
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index a1bf46c64b93..edf7aff93268 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -630,7 +630,7 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
 
         local->hw.conf.listen_interval = local->hw.max_listen_interval;
 
-        local->hw.conf.dynamic_ps_forced_timeout = -1;
+        local->dynamic_ps_forced_timeout = -1;
 
         result = sta_info_start(local);
         if (result < 0)
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 74479c2d12d4..1c0d8fce08dd 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -561,23 +561,19 @@ void ieee80211_recalc_ps(struct ieee80211_local *local, s32 latency)
                 beaconint_us = ieee80211_tu_to_usec(
                                         found->vif.bss_conf.beacon_int);
 
-                timeout = local->hw.conf.dynamic_ps_forced_timeout;
+                timeout = local->dynamic_ps_forced_timeout;
                 if (timeout < 0) {
                         /*
+                         * Go to full PSM if the user configures a very low
+                         * latency requirement.
                          * The 2 second value is there for compatibility until
                          * the PM_QOS_NETWORK_LATENCY is configured with real
                          * values.
                          */
-                        if (latency == 2000000000)
-                                timeout = 100;
-                        else if (latency <= 50000)
-                                timeout = 300;
-                        else if (latency <= 100000)
-                                timeout = 100;
-                        else if (latency <= 500000)
-                                timeout = 50;
-                        else
+                        if (latency > 1900000000 && latency != 2000000000)
                                 timeout = 0;
+                        else
+                                timeout = 100;
                 }
                 local->hw.conf.dynamic_ps_timeout = timeout;