]> err.no Git - linux-2.6/commitdiff
mac80211: fix incorrect use of CONFIG_MAC80211_IBSS_DEBUG
authorPavel Roskin <proski@gnu.org>
Thu, 21 Feb 2008 16:33:58 +0000 (11:33 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 29 Feb 2008 20:37:27 +0000 (15:37 -0500)
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>
net/mac80211/ieee80211_sta.c

index 6e5b57dccc5075fa65cbb782c48c7e0c0cb06e83..8d620baba4fdda4ed3a753aeab2efd18243eff02 100644 (file)
@@ -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);