From 2b8eb556fd6545e0085bfbef372c0f51171e04a9 Mon Sep 17 00:00:00 2001
From: Pavel Roskin <proski@gnu.org>
Date: Thu, 21 Feb 2008 11:33:58 -0500
Subject: [PATCH] --- yaml --- r: 89963 b: refs/heads/master c:
 d97cf01576e1867d26b5c8de360380f815a1b7df h: refs/heads/master i:   89961:
 2402dc82e4ba45887d814e7d5ed9715ce516df7b   89959:
 ef2d4b063fcf97dee35f21601ba706b01a4364c0 v: v3

---
 [refs]                             | 2 +-
 trunk/net/mac80211/ieee80211_sta.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index fe39c26bdfd1..3fbc0dd85b8c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2976ab005695c1b73f9dbdb4d0f85ed5e0319eb
+refs/heads/master: d97cf01576e1867d26b5c8de360380f815a1b7df
diff --git a/trunk/net/mac80211/ieee80211_sta.c b/trunk/net/mac80211/ieee80211_sta.c
index 6e5b57dccc50..8d620baba4fd 100644
--- a/trunk/net/mac80211/ieee80211_sta.c
+++ b/trunk/net/mac80211/ieee80211_sta.c
@@ -2453,10 +2453,12 @@ static void ieee80211_rx_bss_info(struct net_device *dev,
 		       jiffies);
 #endif /* CONFIG_MAC80211_IBSS_DEBUG */
 		if (beacon_timestamp > rx_timestamp) {
-			if (CONFIG_MAC80211_IBSS_DEBUG || net_ratelimit())
+#ifdef CONFIG_MAC80211_IBSS_DEBUG
+			if (net_ratelimit())
 				printk(KERN_DEBUG "%s: beacon TSF higher than "
 				       "local TSF - IBSS merge with BSSID %s\n",
 				       dev->name, print_mac(mac, mgmt->bssid));
+#endif /* CONFIG_MAC80211_IBSS_DEBUG */
 			ieee80211_sta_join_ibss(dev, &sdata->u.sta, bss);
 			ieee80211_ibss_add_sta(dev, NULL,
 					       mgmt->bssid, mgmt->sa);