mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-28 10:29:51 +02:00
e6a49e7bd0
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6333 3c298f89-4303-0410-b956-a3cf2f4a3e73
149 lines
4.9 KiB
Diff
149 lines
4.9 KiB
Diff
diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
|
|
--- madwifi.old/ath/if_ath.c 2007-02-20 23:24:27.274770480 +0100
|
|
+++ madwifi.dev/ath/if_ath.c 2007-02-20 23:26:49.917085552 +0100
|
|
@@ -72,7 +72,7 @@
|
|
#include <net80211/if_llc.h>
|
|
#endif
|
|
|
|
-#define AR_DEBUG
|
|
+#undef AR_DEBUG
|
|
|
|
#include "if_athrate.h"
|
|
#include "net80211/if_athproto.h"
|
|
@@ -347,7 +347,7 @@
|
|
ath_keyprint(__func__, ix, hk, mac); \
|
|
} while (0)
|
|
#else /* defined(AR_DEBUG) */
|
|
-#define IFF_DUMPPKTS(sc, _m) netif_msg_dumppkts(&sc->sc_ic)
|
|
+#define IFF_DUMPPKTS(sc, _m) 0
|
|
#define DPRINTF(sc, _m, _fmt, ...)
|
|
#define KEYPRINTF(sc, k, ix, mac)
|
|
#endif /* defined(AR_DEBUG) */
|
|
diff -ur madwifi.old/ath_rate/amrr/amrr.c madwifi.dev/ath_rate/amrr/amrr.c
|
|
--- madwifi.old/ath_rate/amrr/amrr.c 2007-02-20 23:24:27.274770480 +0100
|
|
+++ madwifi.dev/ath_rate/amrr/amrr.c 2007-02-20 23:23:54.714720360 +0100
|
|
@@ -67,7 +67,7 @@
|
|
|
|
#include "amrr.h"
|
|
|
|
-#define AMRR_DEBUG
|
|
+#undef AMRR_DEBUG
|
|
#ifdef AMRR_DEBUG
|
|
#define DPRINTF(sc, _fmt, ...) do { \
|
|
if (sc->sc_debug & 0x10) \
|
|
diff -ur madwifi.old/ath_rate/onoe/onoe.c madwifi.dev/ath_rate/onoe/onoe.c
|
|
--- madwifi.old/ath_rate/onoe/onoe.c 2007-02-20 23:24:27.275770328 +0100
|
|
+++ madwifi.dev/ath_rate/onoe/onoe.c 2007-02-20 23:23:54.714720360 +0100
|
|
@@ -63,7 +63,7 @@
|
|
|
|
#include "onoe.h"
|
|
|
|
-#define ONOE_DEBUG
|
|
+#undef ONOE_DEBUG
|
|
#ifdef ONOE_DEBUG
|
|
enum {
|
|
ATH_DEBUG_RATE = 0x00000010, /* rate control */
|
|
diff -ur madwifi.old/ath_rate/sample/sample.c madwifi.dev/ath_rate/sample/sample.c
|
|
--- madwifi.old/ath_rate/sample/sample.c 2007-02-20 23:24:27.275770328 +0100
|
|
+++ madwifi.dev/ath_rate/sample/sample.c 2007-02-20 23:23:54.715720208 +0100
|
|
@@ -65,7 +65,7 @@
|
|
|
|
#include "sample.h"
|
|
|
|
-#define SAMPLE_DEBUG
|
|
+#undef SAMPLE_DEBUG
|
|
#ifdef SAMPLE_DEBUG
|
|
enum {
|
|
ATH_DEBUG_RATE = 0x00000010 /* rate control */
|
|
diff -ur madwifi.old/net80211/ieee80211_proto.c madwifi.dev/net80211/ieee80211_proto.c
|
|
--- madwifi.old/net80211/ieee80211_proto.c 2007-02-20 23:23:54.682725000 +0100
|
|
+++ madwifi.dev/net80211/ieee80211_proto.c 2007-02-20 23:26:03.244180912 +0100
|
|
@@ -307,6 +307,7 @@
|
|
}
|
|
EXPORT_SYMBOL(ieee80211_print_essid);
|
|
|
|
+#ifdef IEEE80211_DEBUG
|
|
void
|
|
ieee80211_dump_pkt(struct ieee80211com *ic,
|
|
const u_int8_t *buf, int len, int rate, int rssi)
|
|
@@ -385,6 +386,7 @@
|
|
}
|
|
}
|
|
EXPORT_SYMBOL(ieee80211_dump_pkt);
|
|
+#endif /* IEEE80211_DEBUG */
|
|
|
|
int
|
|
ieee80211_fix_rate(struct ieee80211_node *ni, int flags)
|
|
diff -ur madwifi.old/net80211/ieee80211_proto.h madwifi.dev/net80211/ieee80211_proto.h
|
|
--- madwifi.old/net80211/ieee80211_proto.h 2006-06-10 04:17:05.000000000 +0200
|
|
+++ madwifi.dev/net80211/ieee80211_proto.h 2007-02-20 23:27:28.791175792 +0100
|
|
@@ -246,7 +246,11 @@
|
|
#endif
|
|
int ieee80211_new_state(struct ieee80211vap *, enum ieee80211_state, int);
|
|
void ieee80211_print_essid(const u_int8_t *, int);
|
|
+#ifdef IEEE80211_DEBUG
|
|
void ieee80211_dump_pkt(struct ieee80211com *, const u_int8_t *, int, int, int);
|
|
+#else
|
|
+#define ieee80211_dump_pkt(...)
|
|
+#endif
|
|
struct sk_buff *ieee80211_getcfframe(struct ieee80211vap *, int);
|
|
|
|
/*
|
|
diff -ur madwifi.old/net80211/ieee80211_var.h madwifi.dev/net80211/ieee80211_var.h
|
|
--- madwifi.old/net80211/ieee80211_var.h 2007-02-20 23:24:27.276770176 +0100
|
|
+++ madwifi.dev/net80211/ieee80211_var.h 2007-02-20 23:23:54.715720208 +0100
|
|
@@ -37,7 +37,7 @@
|
|
/*
|
|
* Definitions for IEEE 802.11 drivers.
|
|
*/
|
|
-#define IEEE80211_DEBUG
|
|
+#undef IEEE80211_DEBUG
|
|
#undef IEEE80211_DEBUG_REFCNT /* node refcnt stuff */
|
|
|
|
#include <net80211/ieee80211_linux.h>
|
|
diff -ur madwifi.old/tools/do_multi.c madwifi.dev/tools/do_multi.c
|
|
--- madwifi.old/tools/do_multi.c 2007-02-20 23:24:27.276770176 +0100
|
|
+++ madwifi.dev/tools/do_multi.c 2007-02-20 23:23:54.715720208 +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)
|
|
diff -ur madwifi.old/tools/Makefile madwifi.dev/tools/Makefile
|
|
--- madwifi.old/tools/Makefile 2007-02-20 23:24:27.276770176 +0100
|
|
+++ madwifi.dev/tools/Makefile 2007-02-20 23:23:54.716720056 +0100
|
|
@@ -52,7 +52,7 @@
|
|
|
|
ifdef DOMULTI
|
|
OBJS= do_multi.o athstats.o 80211stats.o athkey.o athchans.o athctrl.o \
|
|
- athdebug.o 80211debug.o wlanconfig.o
|
|
+ wlanconfig.o
|
|
ALL= ${OBJS} madwifi_multi
|
|
endif
|
|
|
|
@@ -85,7 +85,7 @@
|
|
${CC} -c -o do_multi.o -DDOMULTI=1 ${ALL_CFLAGS} do_multi.c
|
|
madwifi_multi:
|
|
${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
|
|
|