diff --git a/[refs] b/[refs]
index ef54d5cb90b4..487013f4a1b5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e61f234079b49c7e075b12551797fc4954704019
+refs/heads/master: d91f190c412aff940a46cabaccf114361c133605
diff --git a/trunk/drivers/net/wireless/mac80211_hwsim.c b/trunk/drivers/net/wireless/mac80211_hwsim.c
index e67b424f925e..8fa6e6ce5705 100644
--- a/trunk/drivers/net/wireless/mac80211_hwsim.c
+++ b/trunk/drivers/net/wireless/mac80211_hwsim.c
@@ -618,7 +618,7 @@ static void mac80211_hwsim_bss_info_changed(struct ieee80211_hw *hw,
 		printk(KERN_DEBUG "  %s: BCNINT: %d\n",
 		       wiphy_name(hw->wiphy), info->beacon_int);
 		data->beacon_int = 1024 * info->beacon_int / 1000 * HZ / 1000;
-		if (WARN_ON(data->beacon_int))
+		if (WARN_ON(!data->beacon_int))
 			data->beacon_int = 1;
 	}