diff --git a/[refs] b/[refs] index 989c6f8d3ffa..ed84a9077427 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 97cad51e191919b43aabdc85b83241b66c3fcf2c +refs/heads/master: 75e6c3b72b3ab01c47629f3fbd0fed4e6550bf3a diff --git a/trunk/net/wireless/core.c b/trunk/net/wireless/core.c index cd7dff9c75f4..1e189306560d 100644 --- a/trunk/net/wireless/core.c +++ b/trunk/net/wireless/core.c @@ -671,7 +671,7 @@ static int cfg80211_netdev_notifier_call(struct notifier_block * nb, wdev->wext.default_mgmt_key = -1; wdev->wext.connect.auth_type = NL80211_AUTHTYPE_AUTOMATIC; wdev->wext.ps = CONFIG_CFG80211_DEFAULT_PS_VALUE; - wdev->wext.ps_timeout = 500; + wdev->wext.ps_timeout = 100; if (rdev->ops->set_power_mgmt) if (rdev->ops->set_power_mgmt(wdev->wiphy, dev, wdev->wext.ps,