diff options
author | Pavel Roskin <proski@gnu.org> | 2008-02-21 11:33:58 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-02-29 15:37:27 -0500 |
commit | d97cf01576e1867d26b5c8de360380f815a1b7df (patch) | |
tree | 4cb503aed2c074cdb95a15f8ea069c853644223a /net/mac80211/ieee80211_sta.c | |
parent | c2976ab005695c1b73f9dbdb4d0f85ed5e0319eb (diff) |
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>
Diffstat (limited to 'net/mac80211/ieee80211_sta.c')
-rw-r--r-- | net/mac80211/ieee80211_sta.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c index 6e5b57dccc50..8d620baba4fd 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, | |||
2453 | jiffies); | 2453 | jiffies); |
2454 | #endif /* CONFIG_MAC80211_IBSS_DEBUG */ | 2454 | #endif /* CONFIG_MAC80211_IBSS_DEBUG */ |
2455 | if (beacon_timestamp > rx_timestamp) { | 2455 | if (beacon_timestamp > rx_timestamp) { |
2456 | if (CONFIG_MAC80211_IBSS_DEBUG || net_ratelimit()) | 2456 | #ifdef CONFIG_MAC80211_IBSS_DEBUG |
2457 | if (net_ratelimit()) | ||
2457 | printk(KERN_DEBUG "%s: beacon TSF higher than " | 2458 | printk(KERN_DEBUG "%s: beacon TSF higher than " |
2458 | "local TSF - IBSS merge with BSSID %s\n", | 2459 | "local TSF - IBSS merge with BSSID %s\n", |
2459 | dev->name, print_mac(mac, mgmt->bssid)); | 2460 | dev->name, print_mac(mac, mgmt->bssid)); |
2461 | #endif /* CONFIG_MAC80211_IBSS_DEBUG */ | ||
2460 | ieee80211_sta_join_ibss(dev, &sdata->u.sta, bss); | 2462 | ieee80211_sta_join_ibss(dev, &sdata->u.sta, bss); |
2461 | ieee80211_ibss_add_sta(dev, NULL, | 2463 | ieee80211_ibss_add_sta(dev, NULL, |
2462 | mgmt->bssid, mgmt->sa); | 2464 | mgmt->bssid, mgmt->sa); |