Merge branch 'master' into for-2.6.35

[safe/jmp/linux-2.6] / net / wireless / core.c

diff --git a/net/wireless/core.c b/net/wireless/core.c
index 7fdb940..37d0e0a 100644 (file)
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -8,6 +8,7 @@
 #include <linux/module.h>
 #include <linux/err.h>
 #include <linux/list.h>
+#include <linux/slab.h>
 #include <linux/nl80211.h>
 #include <linux/debugfs.h>
 #include <linux/notifier.h>
@@ -704,7 +705,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,