diff --git a/[refs] b/[refs]
index ad3bfbfeff9b..42140bb812aa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe9f6342c86292aee1941447f22dc5470735e5a1
+refs/heads/master: 6a211bf1fc63891bfbc510d9caa751c4dee4bc37
diff --git a/trunk/net/mac80211/scan.c b/trunk/net/mac80211/scan.c
index 039901109fa1..71e10cabf811 100644
--- a/trunk/net/mac80211/scan.c
+++ b/trunk/net/mac80211/scan.c
@@ -90,8 +90,8 @@ ieee80211_bss_info_update(struct ieee80211_local *local,
 		bss->dtim_period = tim_ie->dtim_period;
 	}
 
-	/* set default value for buggy APs */
-	if (!elems->tim || bss->dtim_period == 0)
+	/* set default value for buggy AP/no TIM element */
+	if (bss->dtim_period == 0)
 		bss->dtim_period = 1;
 
 	bss->supp_rates_len = 0;