From 20538a7df679a9b60b34004224f9483766f47564 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Fri, 24 Apr 2009 15:13:54 +0200 Subject: [PATCH] --- yaml --- r: 150135 b: refs/heads/master c: d91f190c412aff940a46cabaccf114361c133605 h: refs/heads/master i: 150133: de8ed4cc54c5c190d2f5cc58070519a7c19f0a48 150131: 88f11609e32c2eb0c313009a0e0a2695798c23cb 150127: 8624209dfdc008fdf4c85a94bc318a47dc1ff997 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/mac80211_hwsim.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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; }