1 diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
2 --- madwifi.old/ath/if_ath.c 2007-02-20 23:24:27.274770480 +0100
3 +++ madwifi.dev/ath/if_ath.c 2007-02-20 23:26:49.917085552 +0100
5 #include <net80211/if_llc.h>
11 #include "if_athrate.h"
12 #include "net80211/if_athproto.h"
14 ath_keyprint(__func__, ix, hk, mac); \
16 #else /* defined(AR_DEBUG) */
17 -#define IFF_DUMPPKTS(sc, _m) netif_msg_dumppkts(&sc->sc_ic)
18 +#define IFF_DUMPPKTS(sc, _m) 0
19 #define DPRINTF(sc, _m, _fmt, ...)
20 #define KEYPRINTF(sc, k, ix, mac)
21 #endif /* defined(AR_DEBUG) */
22 diff -ur madwifi.old/ath_rate/amrr/amrr.c madwifi.dev/ath_rate/amrr/amrr.c
23 --- madwifi.old/ath_rate/amrr/amrr.c 2007-02-20 23:24:27.274770480 +0100
24 +++ madwifi.dev/ath_rate/amrr/amrr.c 2007-02-20 23:23:54.714720360 +0100
32 #define DPRINTF(sc, _fmt, ...) do { \
33 if (sc->sc_debug & 0x10) \
34 diff -ur madwifi.old/ath_rate/onoe/onoe.c madwifi.dev/ath_rate/onoe/onoe.c
35 --- madwifi.old/ath_rate/onoe/onoe.c 2007-02-20 23:24:27.275770328 +0100
36 +++ madwifi.dev/ath_rate/onoe/onoe.c 2007-02-20 23:23:54.714720360 +0100
45 ATH_DEBUG_RATE = 0x00000010, /* rate control */
46 diff -ur madwifi.old/ath_rate/sample/sample.c madwifi.dev/ath_rate/sample/sample.c
47 --- madwifi.old/ath_rate/sample/sample.c 2007-02-20 23:24:27.275770328 +0100
48 +++ madwifi.dev/ath_rate/sample/sample.c 2007-02-20 23:23:54.715720208 +0100
57 ATH_DEBUG_RATE = 0x00000010 /* rate control */
58 diff -ur madwifi.old/net80211/ieee80211_proto.c madwifi.dev/net80211/ieee80211_proto.c
59 --- madwifi.old/net80211/ieee80211_proto.c 2007-02-20 23:23:54.682725000 +0100
60 +++ madwifi.dev/net80211/ieee80211_proto.c 2007-02-20 23:26:03.244180912 +0100
63 EXPORT_SYMBOL(ieee80211_print_essid);
65 +#ifdef IEEE80211_DEBUG
67 ieee80211_dump_pkt(struct ieee80211com *ic,
68 const u_int8_t *buf, int len, int rate, int rssi)
72 EXPORT_SYMBOL(ieee80211_dump_pkt);
73 +#endif /* IEEE80211_DEBUG */
76 ieee80211_fix_rate(struct ieee80211_node *ni, int flags)
77 diff -ur madwifi.old/net80211/ieee80211_proto.h madwifi.dev/net80211/ieee80211_proto.h
78 --- madwifi.old/net80211/ieee80211_proto.h 2006-06-10 04:17:05.000000000 +0200
79 +++ madwifi.dev/net80211/ieee80211_proto.h 2007-02-20 23:27:28.791175792 +0100
82 int ieee80211_new_state(struct ieee80211vap *, enum ieee80211_state, int);
83 void ieee80211_print_essid(const u_int8_t *, int);
84 +#ifdef IEEE80211_DEBUG
85 void ieee80211_dump_pkt(struct ieee80211com *, const u_int8_t *, int, int, int);
87 +#define ieee80211_dump_pkt(...)
89 struct sk_buff *ieee80211_getcfframe(struct ieee80211vap *, int);
92 diff -ur madwifi.old/net80211/ieee80211_var.h madwifi.dev/net80211/ieee80211_var.h
93 --- madwifi.old/net80211/ieee80211_var.h 2007-02-20 23:24:27.276770176 +0100
94 +++ madwifi.dev/net80211/ieee80211_var.h 2007-02-20 23:23:54.715720208 +0100
97 * Definitions for IEEE 802.11 drivers.
99 -#define IEEE80211_DEBUG
100 +#undef IEEE80211_DEBUG
101 #undef IEEE80211_DEBUG_REFCNT /* node refcnt stuff */
103 #include <net80211/ieee80211_linux.h>
104 diff -ur madwifi.old/tools/do_multi.c madwifi.dev/tools/do_multi.c
105 --- madwifi.old/tools/do_multi.c 2007-02-20 23:24:27.276770176 +0100
106 +++ madwifi.dev/tools/do_multi.c 2007-02-20 23:23:54.715720208 +0100
109 progname = basename(argv[0]);
112 if(strcmp(progname, "80211debug") == 0)
113 ret = a80211debug_init(argc, argv);
115 if(strcmp(progname, "80211stats") == 0)
116 ret = a80211stats_init(argc, argv);
117 if(strcmp(progname, "athchans") == 0)
118 ret = athchans_init(argc, argv);
119 if(strcmp(progname, "athctrl") == 0)
120 ret = athctrl_init(argc, argv);
122 if(strcmp(progname, "athdebug") == 0)
123 ret = athdebug_init(argc, argv);
125 if(strcmp(progname, "athkey") == 0)
126 ret = athkey_init(argc, argv);
127 if(strcmp(progname, "athstats") == 0)
128 diff -ur madwifi.old/tools/Makefile madwifi.dev/tools/Makefile
129 --- madwifi.old/tools/Makefile 2007-02-20 23:24:27.276770176 +0100
130 +++ madwifi.dev/tools/Makefile 2007-02-20 23:23:54.716720056 +0100
134 OBJS= do_multi.o athstats.o 80211stats.o athkey.o athchans.o athctrl.o \
135 - athdebug.o 80211debug.o wlanconfig.o
137 ALL= ${OBJS} madwifi_multi
141 ${CC} -c -o do_multi.o -DDOMULTI=1 ${ALL_CFLAGS} do_multi.c
143 ${CC} -o madwifi_multi ${LDFLAGS} ${OBJS}
144 - for i in athstats 80211stats athkey athchans athctrl athdebug wlanconfig 80211debug; do \
145 + for i in athstats 80211stats athkey athchans athctrl wlanconfig; do \
146 ln -s -f madwifi_multi $$i; \