Index: madwifi-ng-r2834-20071106/ath/if_ath.c
===================================================================
--- madwifi-ng-r2834-20071106.orig/ath/if_ath.c	2007-11-07 14:02:04.077603246 +0100
+++ madwifi-ng-r2834-20071106/ath/if_ath.c	2007-11-07 14:02:04.537629461 +0100
@@ -75,7 +75,7 @@
 #include <net80211/if_llc.h>
 #endif
 
-#define	AR_DEBUG
+#undef	AR_DEBUG
 
 #include "net80211/if_athproto.h"
 #include "if_athvar.h"
Index: madwifi-ng-r2834-20071106/ath_rate/amrr/amrr.c
===================================================================
--- madwifi-ng-r2834-20071106.orig/ath_rate/amrr/amrr.c	2007-11-07 14:01:59.177323993 +0100
+++ madwifi-ng-r2834-20071106/ath_rate/amrr/amrr.c	2007-11-07 14:02:04.545629914 +0100
@@ -70,7 +70,7 @@
 
 #include "amrr.h"
 
-#define	AMRR_DEBUG
+#undef	AMRR_DEBUG
 #ifdef AMRR_DEBUG
 #define	DPRINTF(sc, _fmt, ...) do {					\
 	if (sc->sc_debug & 0x10)					\
Index: madwifi-ng-r2834-20071106/ath_rate/minstrel/minstrel.c
===================================================================
--- madwifi-ng-r2834-20071106.orig/ath_rate/minstrel/minstrel.c	2007-11-07 14:02:01.169437517 +0100
+++ madwifi-ng-r2834-20071106/ath_rate/minstrel/minstrel.c	2007-11-07 14:02:04.549630142 +0100
@@ -117,7 +117,7 @@
 
 #include "minstrel.h"
 
-#define	MINSTREL_DEBUG
+#undef	MINSTREL_DEBUG
 #ifdef MINSTREL_DEBUG
 enum {
 		ATH_DEBUG_RATE		= 0x00000010	/* rate control */
Index: madwifi-ng-r2834-20071106/ath_rate/onoe/onoe.c
===================================================================
--- madwifi-ng-r2834-20071106.orig/ath_rate/onoe/onoe.c	2007-11-07 14:01:59.193324906 +0100
+++ madwifi-ng-r2834-20071106/ath_rate/onoe/onoe.c	2007-11-07 14:02:04.553630371 +0100
@@ -66,7 +66,7 @@
 
 #include "onoe.h"
 
-#define	ONOE_DEBUG
+#undef	ONOE_DEBUG
 #ifdef ONOE_DEBUG
 enum {
 	ATH_DEBUG_RATE	= 0x00000010,	/* rate control */
Index: madwifi-ng-r2834-20071106/ath_rate/sample/sample.c
===================================================================
--- madwifi-ng-r2834-20071106.orig/ath_rate/sample/sample.c	2007-11-07 14:01:59.201325359 +0100
+++ madwifi-ng-r2834-20071106/ath_rate/sample/sample.c	2007-11-07 14:02:04.557630601 +0100
@@ -68,7 +68,7 @@
 
 #include "sample.h"
 
-#define	SAMPLE_DEBUG
+#undef	SAMPLE_DEBUG
 #ifdef SAMPLE_DEBUG
 enum {
 	ATH_DEBUG_NODE		= 0x00080000,	/* node management */
Index: madwifi-ng-r2834-20071106/net80211/ieee80211_var.h
===================================================================
--- madwifi-ng-r2834-20071106.orig/net80211/ieee80211_var.h	2007-11-07 14:01:59.209325817 +0100
+++ madwifi-ng-r2834-20071106/net80211/ieee80211_var.h	2007-11-07 14:02:04.561630827 +0100
@@ -35,8 +35,8 @@
 #ifndef _NET80211_IEEE80211_VAR_H_
 #define _NET80211_IEEE80211_VAR_H_
 
-#define	IEEE80211_DEBUG
-#define	IEEE80211_DEBUG_REFCNT			/* Node reference count debugging */
+#undef	IEEE80211_DEBUG
+#undef	IEEE80211_DEBUG_REFCNT			/* Node reference count debugging */
 
 /* Definitions for IEEE 802.11 drivers. */
 #include <net80211/ieee80211_linux.h>
Index: madwifi-ng-r2834-20071106/tools/do_multi.c
===================================================================
--- madwifi-ng-r2834-20071106.orig/tools/do_multi.c	2007-11-07 14:02:00.197382122 +0100
+++ madwifi-ng-r2834-20071106/tools/do_multi.c	2007-11-07 14:02:04.565631053 +0100
@@ -9,16 +9,20 @@
 
     progname = basename(argv[0]);
 
+#if 0
     if(strcmp(progname, "80211debug") == 0)
 	ret = a80211debug_init(argc, argv);
+#endif
     if(strcmp(progname, "80211stats") == 0)
 	ret = a80211stats_init(argc, argv);
     if(strcmp(progname, "athchans") == 0)
 	ret = athchans_init(argc, argv);
     if(strcmp(progname, "athctrl") == 0)
 	ret =  athctrl_init(argc, argv);
+#if 0
     if(strcmp(progname, "athdebug") == 0)
 	ret =  athdebug_init(argc, argv);
+#endif
     if(strcmp(progname, "athkey") == 0)
 	ret =  athkey_init(argc, argv);
     if(strcmp(progname, "athstats") == 0)
Index: madwifi-ng-r2834-20071106/tools/Makefile
===================================================================
--- madwifi-ng-r2834-20071106.orig/tools/Makefile	2007-11-07 14:02:00.197382122 +0100
+++ madwifi-ng-r2834-20071106/tools/Makefile	2007-11-07 14:02:04.565631053 +0100
@@ -48,7 +48,7 @@
 
 
 ALLPROGS=	athstats 80211stats athkey athchans athctrl \
-	athdebug 80211debug wlanconfig ath_info
+	wlanconfig ath_info
 
 OBJS=	$(patsubst %,%.o,$(ALLPROGS) do_multi)
 ALL=	${OBJS} madwifi_multi
@@ -84,7 +84,7 @@
 	${CC} -c -o do_multi.o -DDOMULTI=1 ${ALL_CFLAGS} do_multi.c
 madwifi_multi: $(OBJS)
 	${CC} -o madwifi_multi ${LDFLAGS} ${OBJS}
-	for i in athstats 80211stats athkey athchans athctrl athdebug wlanconfig 80211debug; do \
+	for i in athstats 80211stats athkey athchans athctrl wlanconfig; do \
 	ln -s -f madwifi_multi $$i; \
 	done