summaryrefslogtreecommitdiffstats
path: root/net/wireless/core.c
diff options
context:
space:
mode:
authorJuuso Oikarinen <juuso.oikarinen@nokia.com>2010-04-27 12:47:41 +0300
committerJohn W. Linville <linville@tuxdriver.com>2010-04-27 16:09:22 -0400
commit9043f3b89abebfbfe4b8d64c7b71b9ac0b9eaa0b (patch)
treec7d0419f0f8c44ca92e33b7acd21295e1befa74f /net/wireless/core.c
parent195e294d21e88af879da4f88db2ceeb4ec28a755 (diff)
downloadop-kernel-dev-9043f3b89abebfbfe4b8d64c7b71b9ac0b9eaa0b.zip
op-kernel-dev-9043f3b89abebfbfe4b8d64c7b71b9ac0b9eaa0b.tar.gz
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/core.c')
-rw-r--r--net/wireless/core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c
index 7fdb940..40cbbbf 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,
wdev->ps = true;
else
wdev->ps = false;
- wdev->ps_timeout = 100;
+ /* allow mac80211 to determine the timeout */
+ wdev->ps_timeout = -1;
if (rdev->ops->set_power_mgmt)
if (rdev->ops->set_power_mgmt(wdev->wiphy, dev,
wdev->ps,
OpenPOWER on IntegriCloud