mac80211: Fix ps-qos network latency handling

The ps-qos latency handling is broken. It uses predetermined latency values
to select specific dynamic PS timeouts. With common AP configurations, these
values overlap with beacon interval and are therefore essentially useless
(for network latencies less than the beacon interval, PSM is disabled.)

This patch remedies the problem by replacing the predetermined network latency
values with one high value (1900ms) which is used to go trigger full psm. For
backwards compatibility, the value 2000ms is still mapped to a dynamic ps
timeout of 100ms.

Currently also the mac80211 internal value for storing user space configured
dynamic PSM values is incorrectly in the driver visible ieee80211_conf struct.
Move it to the ieee80211_local struct.

Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 6 insertions, 10 deletions

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;