diff options
| author | Juuso Oikarinen <juuso.oikarinen@nokia.com> | 2010-04-27 12:47:41 +0300 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-04-27 16:09:22 -0400 |
| commit | 9043f3b89abebfbfe4b8d64c7b71b9ac0b9eaa0b (patch) | |
| tree | c7d0419f0f8c44ca92e33b7acd21295e1befa74f | |
| 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>
| -rw-r--r-- | include/net/cfg80211.h | 2 | ||||
| -rw-r--r-- | net/wireless/core.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index f6b29bf925d..7d10c0182f5 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -1020,6 +1020,8 @@ struct cfg80211_pmksa { * RSN IE. It allows for faster roaming between WPA2 BSSIDs. * @del_pmksa: Delete a cached PMKID. * @flush_pmksa: Flush all cached PMKIDs. + * @set_power_mgmt: Configure WLAN power management. A timeout value of -1 + * allows the driver to adjust the dynamic ps timeout value. * @set_cqm_rssi_config: Configure connection quality monitor RSSI threshold. * */ diff --git a/net/wireless/core.c b/net/wireless/core.c index 7fdb9409ad2..40cbbbfbccb 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, |