openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Pavel Roskin 2008-02-21 11:33:58 -05:00 committed by John W. Linville
parent c2976ab005
commit d97cf01576
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/mac80211/ieee80211_sta.c
View File

@ -2453,10 +2453,12 @@ static void ieee80211_rx_bss_info(struct net_device *dev,
jiffies); jiffies);
#endif /* CONFIG_MAC80211_IBSS_DEBUG */ #endif /* CONFIG_MAC80211_IBSS_DEBUG */
if (beacon_timestamp > rx_timestamp) { 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 " printk(KERN_DEBUG "%s: beacon TSF higher than "
"local TSF - IBSS merge with BSSID %s\n", "local TSF - IBSS merge with BSSID %s\n",
dev->name, print_mac(mac, mgmt->bssid)); dev->name, print_mac(mac, mgmt->bssid));
#endif /* CONFIG_MAC80211_IBSS_DEBUG */
ieee80211_sta_join_ibss(dev, &sdata->u.sta, bss); ieee80211_sta_join_ibss(dev, &sdata->u.sta, bss);
ieee80211_ibss_add_sta(dev, NULL, ieee80211_ibss_add_sta(dev, NULL,
mgmt->bssid, mgmt->sa); mgmt->bssid, mgmt->sa);