clean up madwifi and sync with trunk
[openwrt/svn-archive/archive.git] / package / madwifi / patches / 200-no_debug.patch
1 diff -urN madwifi-ng-r2377-20070526.old/ath/if_ath.c madwifi-ng-r2377-20070526.dev/ath/if_ath.c
2 --- madwifi-ng-r2377-20070526.old/ath/if_ath.c 2007-05-26 18:51:09.199688976 +0200
3 +++ madwifi-ng-r2377-20070526.dev/ath/if_ath.c 2007-05-26 18:51:09.207687760 +0200
4 @@ -75,7 +75,7 @@
5 #include <net80211/if_llc.h>
6 #endif
7
8 -#define AR_DEBUG
9 +#undef AR_DEBUG
10
11 #include "net80211/if_athproto.h"
12 #include "if_athvar.h"
13 @@ -368,7 +368,7 @@
14 ath_keyprint(sc, __func__, ix, hk, mac); \
15 } while (0)
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 -urN madwifi-ng-r2377-20070526.old/ath_rate/amrr/amrr.c madwifi-ng-r2377-20070526.dev/ath_rate/amrr/amrr.c
23 --- madwifi-ng-r2377-20070526.old/ath_rate/amrr/amrr.c 2007-05-21 19:33:26.000000000 +0200
24 +++ madwifi-ng-r2377-20070526.dev/ath_rate/amrr/amrr.c 2007-05-26 18:51:09.208687608 +0200
25 @@ -69,7 +69,7 @@
26
27 #include "amrr.h"
28
29 -#define AMRR_DEBUG
30 +#undef AMRR_DEBUG
31 #ifdef AMRR_DEBUG
32 #define DPRINTF(sc, _fmt, ...) do { \
33 if (sc->sc_debug & 0x10) \
34 diff -urN madwifi-ng-r2377-20070526.old/ath_rate/minstrel/minstrel.c madwifi-ng-r2377-20070526.dev/ath_rate/minstrel/minstrel.c
35 --- madwifi-ng-r2377-20070526.old/ath_rate/minstrel/minstrel.c 2007-05-26 18:51:08.653771968 +0200
36 +++ madwifi-ng-r2377-20070526.dev/ath_rate/minstrel/minstrel.c 2007-05-26 18:51:09.208687608 +0200
37 @@ -116,7 +116,7 @@
38
39 #include "minstrel.h"
40
41 -#define MINSTREL_DEBUG
42 +#undef MINSTREL_DEBUG
43 #ifdef MINSTREL_DEBUG
44 enum {
45 ATH_DEBUG_RATE = 0x00000010 /* rate control */
46 diff -urN madwifi-ng-r2377-20070526.old/ath_rate/onoe/onoe.c madwifi-ng-r2377-20070526.dev/ath_rate/onoe/onoe.c
47 --- madwifi-ng-r2377-20070526.old/ath_rate/onoe/onoe.c 2007-05-21 19:33:26.000000000 +0200
48 +++ madwifi-ng-r2377-20070526.dev/ath_rate/onoe/onoe.c 2007-05-26 18:51:09.209687456 +0200
49 @@ -65,7 +65,7 @@
50
51 #include "onoe.h"
52
53 -#define ONOE_DEBUG
54 +#undef ONOE_DEBUG
55 #ifdef ONOE_DEBUG
56 enum {
57 ATH_DEBUG_RATE = 0x00000010, /* rate control */
58 diff -urN madwifi-ng-r2377-20070526.old/ath_rate/sample/sample.c madwifi-ng-r2377-20070526.dev/ath_rate/sample/sample.c
59 --- madwifi-ng-r2377-20070526.old/ath_rate/sample/sample.c 2007-05-21 19:33:26.000000000 +0200
60 +++ madwifi-ng-r2377-20070526.dev/ath_rate/sample/sample.c 2007-05-26 18:51:09.209687456 +0200
61 @@ -67,7 +67,7 @@
62
63 #include "sample.h"
64
65 -#define SAMPLE_DEBUG
66 +#undef SAMPLE_DEBUG
67 #ifdef SAMPLE_DEBUG
68 enum {
69 ATH_DEBUG_NODE = 0x00080000, /* node management */
70 diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_proto.c madwifi-ng-r2377-20070526.dev/net80211/ieee80211_proto.c
71 --- madwifi-ng-r2377-20070526.old/net80211/ieee80211_proto.c 2007-05-21 17:53:39.000000000 +0200
72 +++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_proto.c 2007-05-26 18:51:09.210687304 +0200
73 @@ -312,6 +312,7 @@
74 }
75 EXPORT_SYMBOL(ieee80211_print_essid);
76
77 +#ifdef IEEE80211_DEBUG
78 void
79 ieee80211_dump_pkt(struct ieee80211com *ic,
80 const u_int8_t *buf, int len, int rate, int rssi)
81 @@ -390,6 +391,7 @@
82 }
83 }
84 EXPORT_SYMBOL(ieee80211_dump_pkt);
85 +#endif /* IEEE80211_DEBUG */
86
87 int
88 ieee80211_fix_rate(struct ieee80211_node *ni, int flags)
89 diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_proto.h madwifi-ng-r2377-20070526.dev/net80211/ieee80211_proto.h
90 --- madwifi-ng-r2377-20070526.old/net80211/ieee80211_proto.h 2007-01-30 05:01:29.000000000 +0100
91 +++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_proto.h 2007-05-26 18:51:09.211687152 +0200
92 @@ -247,7 +247,11 @@
93 #endif
94 int ieee80211_new_state(struct ieee80211vap *, enum ieee80211_state, int);
95 void ieee80211_print_essid(const u_int8_t *, int);
96 +#ifdef IEEE80211_DEBUG
97 void ieee80211_dump_pkt(struct ieee80211com *, const u_int8_t *, int, int, int);
98 +#else
99 +#define ieee80211_dump_pkt(...)
100 +#endif
101 struct sk_buff *ieee80211_getcfframe(struct ieee80211vap *, int);
102
103 /*
104 diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_var.h madwifi-ng-r2377-20070526.dev/net80211/ieee80211_var.h
105 --- madwifi-ng-r2377-20070526.old/net80211/ieee80211_var.h 2007-05-24 23:26:38.000000000 +0200
106 +++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_var.h 2007-05-26 18:51:09.211687152 +0200
107 @@ -35,8 +35,8 @@
108 #ifndef _NET80211_IEEE80211_VAR_H_
109 #define _NET80211_IEEE80211_VAR_H_
110
111 -#define IEEE80211_DEBUG
112 -#define IEEE80211_DEBUG_REFCNT /* Node reference count debugging */
113 +#undef IEEE80211_DEBUG
114 +#undef IEEE80211_DEBUG_REFCNT /* Node reference count debugging */
115
116 /* Definitions for IEEE 802.11 drivers. */
117 #include <net80211/ieee80211_linux.h>
118 diff -urN madwifi-ng-r2377-20070526.old/tools/do_multi.c madwifi-ng-r2377-20070526.dev/tools/do_multi.c
119 --- madwifi-ng-r2377-20070526.old/tools/do_multi.c 2007-05-26 18:51:08.203840368 +0200
120 +++ madwifi-ng-r2377-20070526.dev/tools/do_multi.c 2007-05-26 18:51:09.212687000 +0200
121 @@ -9,16 +9,20 @@
122
123 progname = basename(argv[0]);
124
125 +#if 0
126 if(strcmp(progname, "80211debug") == 0)
127 ret = a80211debug_init(argc, argv);
128 +#endif
129 if(strcmp(progname, "80211stats") == 0)
130 ret = a80211stats_init(argc, argv);
131 if(strcmp(progname, "athchans") == 0)
132 ret = athchans_init(argc, argv);
133 if(strcmp(progname, "athctrl") == 0)
134 ret = athctrl_init(argc, argv);
135 +#if 0
136 if(strcmp(progname, "athdebug") == 0)
137 ret = athdebug_init(argc, argv);
138 +#endif
139 if(strcmp(progname, "athkey") == 0)
140 ret = athkey_init(argc, argv);
141 if(strcmp(progname, "athstats") == 0)
142 diff -urN madwifi-ng-r2377-20070526.old/tools/Makefile madwifi-ng-r2377-20070526.dev/tools/Makefile
143 --- madwifi-ng-r2377-20070526.old/tools/Makefile 2007-05-26 18:51:08.203840368 +0200
144 +++ madwifi-ng-r2377-20070526.dev/tools/Makefile 2007-05-26 18:51:09.212687000 +0200
145 @@ -52,7 +52,7 @@
146
147 ifdef DOMULTI
148 OBJS= do_multi.o athstats.o 80211stats.o athkey.o athchans.o athctrl.o \
149 - athdebug.o 80211debug.o wlanconfig.o
150 + wlanconfig.o
151 ALL= ${OBJS} madwifi_multi
152 endif
153
154 @@ -85,7 +85,7 @@
155 ${CC} -c -o do_multi.o -DDOMULTI=1 ${ALL_CFLAGS} do_multi.c
156 madwifi_multi:
157 ${CC} -o madwifi_multi ${LDFLAGS} ${OBJS}
158 - for i in athstats 80211stats athkey athchans athctrl athdebug wlanconfig 80211debug; do \
159 + for i in athstats 80211stats athkey athchans athctrl wlanconfig; do \
160 ln -s -f madwifi_multi $$i; \
161 done
162
163