diff --git a/[refs] b/[refs]
index d111e2d2f5c3..56ba6be0de60 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7bfbae10dc10a5c94a780d117a57e875d77e8e5a
+refs/heads/master: b446918b77c717a34eaa853dfab55f579d330551
diff --git a/trunk/net/mac80211/main.c b/trunk/net/mac80211/main.c
index ec8f767ba95b..06c33b68d8e5 100644
--- a/trunk/net/mac80211/main.c
+++ b/trunk/net/mac80211/main.c
@@ -558,8 +558,12 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
 
 	debugfs_hw_add(local);
 
+	/*
+	 * if the driver doesn't specify a max listen interval we
+	 * use 5 which should be a safe default
+	 */
 	if (local->hw.max_listen_interval == 0)
-		local->hw.max_listen_interval = 1;
+		local->hw.max_listen_interval = 5;
 
 	local->hw.conf.listen_interval = local->hw.max_listen_interval;