---

yaml --- r: 184540 b: refs/heads/master c: b446918 h: refs/heads/master v: v3
git-mirror · Feb 26, 2010 · d87d58c · d87d58c
1 parent b54f050
commit d87d58c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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;