summaryrefslogtreecommitdiffstats
path: root/net/mac80211/scan.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2010-07-29 16:08:55 +0200
committerJohn W. Linville <linville@tuxdriver.com>2010-07-29 12:55:00 -0400
commite5b900d228b76d445a4240d9aeb3cd8f79205a91 (patch)
treedffa32e827e2d6e5388430ae5ec732f0ca023b11 /net/mac80211/scan.c
parentd28232b461b8d54b09e59325dbac8b0913ce2049 (diff)
downloadlinux-e5b900d228b76d445a4240d9aeb3cd8f79205a91.tar.gz
linux-e5b900d228b76d445a4240d9aeb3cd8f79205a91.tar.bz2
linux-e5b900d228b76d445a4240d9aeb3cd8f79205a91.zip
mac80211: allow drivers to request DTIM period
Some features require knowing the DTIM period before associating. This implements the ability to wait for a beacon in mac80211 before assoc to provide this value. It is optional since most likely not all drivers will need this. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/scan.c')
-rw-r--r--net/mac80211/scan.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index 41635b2c91bf..41f20fb7e670 100644
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -114,6 +114,10 @@ ieee80211_bss_info_update(struct ieee80211_local *local,
bss->dtim_period = tim_ie->dtim_period;
}
+ /* If the beacon had no TIM IE, or it was invalid, use 1 */
+ if (beacon && !bss->dtim_period)
+ bss->dtim_period = 1;
+
/* replace old supported rates if we get new values */
srlen = 0;
if (elems->supp_rates) {