mac80211: allow drivers to request DTIM period

[net-next-2.6.git] / net / mac80211 / scan.c

diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index 41635b2c91bfc23fdb6b8523364aee3b4c57c832..41f20fb7e67083fa8635ba50de021babe7778e8c 100644 (file)
--- 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) {