diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2009-04-16 07:17:25 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-04-22 16:57:16 -0400 |
commit | 10f644a47b76d3e61b98f2d02ce9690b94c51ee5 (patch) | |
tree | fc344d0f888ea0b97608cd53eec1d2dc17672087 /net/mac80211/iface.c | |
parent | 965bedadc01d34027455d5d5b67063ef0209c955 (diff) |
mac80211: disable powersave if pm_qos asks for low latency
When an application asks for a latency lower than the beacon interval
there's nothing we can do -- we need to stay awake and not have the
AP buffer frames for us. Add code to automatically calculate this
constraint in mac80211 so drivers need not concern themselves with it.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/iface.c')
-rw-r--r-- | net/mac80211/iface.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 6240f76e2a43..5d60deb219d3 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c | |||
@@ -317,7 +317,7 @@ static int ieee80211_open(struct net_device *dev) | |||
317 | ieee80211_set_wmm_default(sdata); | 317 | ieee80211_set_wmm_default(sdata); |
318 | } | 318 | } |
319 | 319 | ||
320 | ieee80211_recalc_ps(local); | 320 | ieee80211_recalc_ps(local, -1); |
321 | 321 | ||
322 | /* | 322 | /* |
323 | * ieee80211_sta_work is disabled while network interface | 323 | * ieee80211_sta_work is disabled while network interface |
@@ -574,7 +574,7 @@ static int ieee80211_stop(struct net_device *dev) | |||
574 | hw_reconf_flags = 0; | 574 | hw_reconf_flags = 0; |
575 | } | 575 | } |
576 | 576 | ||
577 | ieee80211_recalc_ps(local); | 577 | ieee80211_recalc_ps(local, -1); |
578 | 578 | ||
579 | /* do after stop to avoid reconfiguring when we stop anyway */ | 579 | /* do after stop to avoid reconfiguring when we stop anyway */ |
580 | if (hw_reconf_flags) | 580 | if (hw_reconf_flags) |