summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Roskin <proski@gnu.org>2008-02-21 11:33:58 -0500
committerJohn W. Linville <linville@tuxdriver.com>2008-02-29 15:37:27 -0500
commitd97cf01576e1867d26b5c8de360380f815a1b7df (patch)
tree4cb503aed2c074cdb95a15f8ea069c853644223a
parentc2976ab005695c1b73f9dbdb4d0f85ed5e0319eb (diff)
downloadop-kernel-dev-d97cf01576e1867d26b5c8de360380f815a1b7df.zip
op-kernel-dev-d97cf01576e1867d26b5c8de360380f815a1b7df.tar.gz
mac80211: fix incorrect use of CONFIG_MAC80211_IBSS_DEBUG
Configuration variables are only available to the preprocessor Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--net/mac80211/ieee80211_sta.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c
index 6e5b57d..8d620ba 100644
--- a/net/mac80211/ieee80211_sta.c
+++ b/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);
OpenPOWER on IntegriCloud