[Madwifi-cvs] revision 1613 committed by mentor

[mentor <svn...@ma...>]

Project     : madwifi
Revision    : 1613
Author      : mentor
Date        : 2006-05-31 22:35:17 +0200 (Wed, 31 May 2006)

Log Message :
Fix compilation without *_DEBUG enabled. Closes #131.

Affected Files:
* trunk/ath/if_ath.c                                  updated             
* trunk/net80211/ieee80211_var.h                      updated             


Modified: trunk/ath/if_ath.c
===================================================================
--- trunk/ath/if_ath.c	2006-05-31 17:13:09 UTC (rev 1612)
+++ trunk/ath/if_ath.c	2006-05-31 20:35:17 UTC (rev 1613)
@@ -300,8 +300,8 @@
 MODULE_PARM_DESC(rfkill, "Enable/disable RFKILL capability");
 MODULE_PARM_DESC(autocreate, "Create ath device in [sta|ap|wds|adhoc|ahdemo|monitor] mode. defaults to sta, use 'none' to disable");
 
+static int	ath_debug = 0;
 #ifdef AR_DEBUG
-static int	ath_debug = 0;
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,52))
 MODULE_PARM(ath_debug, "i");
 #else
@@ -347,11 +347,11 @@
 	if (sc->sc_debug & ATH_DEBUG_KEYCACHE)			\
 		ath_keyprint(__func__, ix, hk, mac);		\
 } while (0)
-#else
+#else /* defined(AR_DEBUG) */
 #define	IFF_DUMPPKTS(sc, _m)	netif_msg_dumppkts(&sc->sc_ic)
 #define	DPRINTF(sc, _m, _fmt, ...)
 #define	KEYPRINTF(sc, k, ix, mac)
-#endif
+#endif /* defined(AR_DEBUG) */
 
 #define ATH_SETUP_XR_VAP(sc,vap,rfilt) \
 	do { \

Modified: trunk/net80211/ieee80211_var.h
===================================================================
--- trunk/net80211/ieee80211_var.h	2006-05-31 17:13:09 UTC (rev 1612)
+++ trunk/net80211/ieee80211_var.h	2006-05-31 20:35:17 UTC (rev 1613)
@@ -637,12 +637,11 @@
 	ieee80211_msg(_vap, IEEE80211_MSG_SCAN)
 #define	ieee80211_msg_assoc(_vap) \
 	ieee80211_msg(_vap, IEEE80211_MSG_ASSOC)
-#else
+#else /* IEEE80211_DEBUG */
 #define	IEEE80211_DPRINTF(_vap, _m, _fmt, ...)
+#define	IEEE80211_NOTE(_vap, _m, _wh, _fmt, ...)
 #define	IEEE80211_NOTE_FRAME(_vap, _m, _wh, _fmt, ...)
 #define	IEEE80211_NOTE_MAC(_vap, _m, _mac, _fmt, ...)
-#define	ieee80211_msg_dumppkts(_vap)	0
-#define	ieee80211_msg(_vap, _m)		0
-#endif
+#endif /* IEEE80211_DEBUG */
 
 #endif /* _NET80211_IEEE80211_VAR_H_ */