diff options
author | Juuso Oikarinen <juuso.oikarinen@nokia.com> | 2010-04-27 05:47:41 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-04-27 16:09:22 -0400 |
commit | 9043f3b89abebfbfe4b8d64c7b71b9ac0b9eaa0b (patch) | |
tree | c7d0419f0f8c44ca92e33b7acd21295e1befa74f /net/wireless | |
parent | 195e294d21e88af879da4f88db2ceeb4ec28a755 (diff) |
cfg80211: Remove default dynamic PS timeout value
Now that the mac80211 is choosing dynamic ps timeouts based on the ps-qos
network latency configuration, configure a default value of -1 as the dynamic
ps timeout in cfg80211. This value allows the mac80211 to determine the value
to be used.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless')
-rw-r--r-- | net/wireless/core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c index 7fdb9409ad2a..40cbbbfbccbf 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c | |||
@@ -704,7 +704,8 @@ static int cfg80211_netdev_notifier_call(struct notifier_block * nb, | |||
704 | wdev->ps = true; | 704 | wdev->ps = true; |
705 | else | 705 | else |
706 | wdev->ps = false; | 706 | wdev->ps = false; |
707 | wdev->ps_timeout = 100; | 707 | /* allow mac80211 to determine the timeout */ |
708 | wdev->ps_timeout = -1; | ||
708 | if (rdev->ops->set_power_mgmt) | 709 | if (rdev->ops->set_power_mgmt) |
709 | if (rdev->ops->set_power_mgmt(wdev->wiphy, dev, | 710 | if (rdev->ops->set_power_mgmt(wdev->wiphy, dev, |
710 | wdev->ps, | 711 | wdev->ps, |