summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorHelmut Schaa <helmut.schaa@googlemail.com>2010-02-24 14:19:37 +0100
committerJohn W. Linville <linville@tuxdriver.com>2010-02-26 16:59:11 -0500
commitb446918b77c717a34eaa853dfab55f579d330551 (patch)
tree1dfe5175f3acd06bcf2ef16ee346a4931a563611 /net
parent7bfbae10dc10a5c94a780d117a57e875d77e8e5a (diff)
downloadlinux-stable-b446918b77c717a34eaa853dfab55f579d330551.tar.gz
linux-stable-b446918b77c717a34eaa853dfab55f579d330551.tar.bz2
linux-stable-b446918b77c717a34eaa853dfab55f579d330551.zip
mac80211: use listen interval 5 as default
Currently if a driver does not set hw.max_listen_interval a listen interval of 1 is negotiated with the AP. Thus, the AP could drop buffered frames for us after just one beacon interval which can easily happen with the current powersave and scan implementation. To avoid this issue increase the default interval to 5 which should be a reasonable safe default. Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/main.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index ec8f767ba95b..06c33b68d8e5 100644
--- a/net/mac80211/main.c
+++ b/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;