mac80211: disable powersave if pm_qos asks for low latency

[~andy/linux] / net / mac80211 / iface.c

diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 6240f76e2a43f00e7d0654ea5f05f08d3fad9737..5d60deb219d39149a708f5832d104f3224464e63 100644 (file)
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -317,7 +317,7 @@ static int ieee80211_open(struct net_device *dev)
                ieee80211_set_wmm_default(sdata);
        }
 
-       ieee80211_recalc_ps(local);
+       ieee80211_recalc_ps(local, -1);
 
        /*
         * ieee80211_sta_work is disabled while network interface
@@ -574,7 +574,7 @@ static int ieee80211_stop(struct net_device *dev)
                hw_reconf_flags = 0;
        }
 
-       ieee80211_recalc_ps(local);
+       ieee80211_recalc_ps(local, -1);
 
        /* do after stop to avoid reconfiguring when we stop anyway */
        if (hw_reconf_flags)