-Index: madwifi-dfs-r3012/tools/80211debug.c
+Index: madwifi-trunk-r3314/tools/80211debug.c
===================================================================
---- madwifi-dfs-r3012.orig/tools/80211debug.c 2007-12-12 23:38:16.916125282 +0100
-+++ madwifi-dfs-r3012/tools/80211debug.c 2007-12-12 23:39:07.114985947 +0100
+--- madwifi-trunk-r3314.orig/tools/80211debug.c 2008-02-20 18:10:46.235149183 +0100
++++ madwifi-trunk-r3314/tools/80211debug.c 2008-02-20 18:10:46.695175398 +0100
@@ -49,6 +49,10 @@
#include <getopt.h>
#include <err.h>
const char *ifname = "ath0";
const char *cp, *tp;
const char *sep;
-Index: madwifi-dfs-r3012/tools/80211stats.c
+Index: madwifi-trunk-r3314/tools/80211stats.c
===================================================================
---- madwifi-dfs-r3012.orig/tools/80211stats.c 2007-12-12 23:38:16.924125726 +0100
-+++ madwifi-dfs-r3012/tools/80211stats.c 2007-12-12 23:38:32.068988792 +0100
+--- madwifi-trunk-r3314.orig/tools/80211stats.c 2008-02-20 18:10:46.243149638 +0100
++++ madwifi-trunk-r3314/tools/80211stats.c 2008-02-20 18:10:46.695175398 +0100
@@ -60,6 +60,10 @@
#include "net80211/ieee80211_crypto.h"
#include "net80211/ieee80211_ioctl.h"
int c, len;
struct ieee80211req_sta_info *si;
u_int8_t buf[24*1024], *cp;
-Index: madwifi-dfs-r3012/tools/athchans.c
+Index: madwifi-trunk-r3314/tools/athchans.c
===================================================================
---- madwifi-dfs-r3012.orig/tools/athchans.c 2007-12-12 23:38:16.932126191 +0100
-+++ madwifi-dfs-r3012/tools/athchans.c 2007-12-12 23:38:32.072989019 +0100
+--- madwifi-trunk-r3314.orig/tools/athchans.c 2008-02-20 18:10:46.247149868 +0100
++++ madwifi-trunk-r3314/tools/athchans.c 2008-02-20 18:10:46.703175854 +0100
@@ -59,6 +59,10 @@
#include "net80211/ieee80211_crypto.h"
#include "net80211/ieee80211_ioctl.h"
static int s = -1;
static const char *progname;
-@@ -139,9 +143,20 @@
+@@ -140,9 +144,20 @@
}
#define MAXCHAN ((int)(sizeof(struct ieee80211req_chanlist) * NBBY))
const char *ifname = "wifi0";
struct ieee80211req_chanlist chanlist;
int c;
-Index: madwifi-dfs-r3012/tools/athctrl.c
+Index: madwifi-trunk-r3314/tools/athctrl.c
===================================================================
---- madwifi-dfs-r3012.orig/tools/athctrl.c 2007-12-12 23:38:16.940126655 +0100
-+++ madwifi-dfs-r3012/tools/athctrl.c 2007-12-12 23:38:32.076989248 +0100
+--- madwifi-trunk-r3314.orig/tools/athctrl.c 2008-02-20 18:10:46.255150323 +0100
++++ madwifi-trunk-r3314/tools/athctrl.c 2008-02-20 18:10:46.707176083 +0100
@@ -53,6 +53,10 @@
#include <net/if.h>
char device[IFNAMSIZ + 1];
int distance = -1;
int c;
-Index: madwifi-dfs-r3012/tools/athdebug.c
+Index: madwifi-trunk-r3314/tools/athdebug.c
===================================================================
---- madwifi-dfs-r3012.orig/tools/athdebug.c 2007-12-12 23:38:16.944126879 +0100
-+++ madwifi-dfs-r3012/tools/athdebug.c 2007-12-12 23:39:24.779992618 +0100
+--- madwifi-trunk-r3314.orig/tools/athdebug.c 2008-02-20 18:10:46.263150778 +0100
++++ madwifi-trunk-r3314/tools/athdebug.c 2008-02-20 18:10:46.711176309 +0100
@@ -52,6 +52,10 @@
#include <getopt.h>
#include <err.h>
#ifdef __linux__
const char *ifname = "wifi0";
#else
-Index: madwifi-dfs-r3012/tools/athkey.c
+Index: madwifi-trunk-r3314/tools/athkey.c
===================================================================
---- madwifi-dfs-r3012.orig/tools/athkey.c 2007-12-12 23:38:16.952127326 +0100
-+++ madwifi-dfs-r3012/tools/athkey.c 2007-12-12 23:38:32.080989474 +0100
+--- madwifi-trunk-r3314.orig/tools/athkey.c 2008-02-20 18:10:46.271151234 +0100
++++ madwifi-trunk-r3314/tools/athkey.c 2008-02-20 18:10:46.711176309 +0100
@@ -59,6 +59,10 @@
#include "net80211/ieee80211_crypto.h"
#include "net80211/ieee80211_ioctl.h"
static int s = -1;
static const char *progname;
-@@ -212,9 +216,19 @@
+@@ -213,9 +217,19 @@
exit(-1);
}
const char *ifname = "wifi0";
struct ieee80211req_key setkey;
struct ieee80211req_del_key delkey;
-Index: madwifi-dfs-r3012/tools/athstats.c
+Index: madwifi-trunk-r3314/tools/athstats.c
===================================================================
---- madwifi-dfs-r3012.orig/tools/athstats.c 2007-12-12 23:38:16.960127784 +0100
-+++ madwifi-dfs-r3012/tools/athstats.c 2007-12-12 23:38:32.080989474 +0100
+--- madwifi-trunk-r3314.orig/tools/athstats.c 2008-02-20 18:10:46.275151463 +0100
++++ madwifi-trunk-r3314/tools/athstats.c 2008-02-20 18:10:46.711176309 +0100
@@ -66,6 +66,10 @@
#undef ARRAY_SIZE
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
#ifdef __linux__
const char *ifname = "wifi0";
#else
-Index: madwifi-dfs-r3012/tools/do_multi.c
+Index: madwifi-trunk-r3314/tools/do_multi.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ madwifi-dfs-r3012/tools/do_multi.c 2007-12-12 23:38:32.080989474 +0100
++++ madwifi-trunk-r3314/tools/do_multi.c 2008-02-20 18:10:46.711176309 +0100
@@ -0,0 +1,32 @@
+#include <string.h>
+#include "do_multi.h"
+
+ return ret;
+}
-Index: madwifi-dfs-r3012/tools/do_multi.h
+Index: madwifi-trunk-r3314/tools/do_multi.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ madwifi-dfs-r3012/tools/do_multi.h 2007-12-12 23:38:32.084989703 +0100
++++ madwifi-trunk-r3314/tools/do_multi.h 2008-02-20 18:10:46.711176309 +0100
@@ -0,0 +1,10 @@
+
+int a80211debug_init(int argc, char *argv[]);
+int athstats_init(int argc, char *argv[]);
+int wlanconfig_init(int argc, char *argv[]);
+int athinfo_init(int argc, char *argv[]);
-Index: madwifi-dfs-r3012/tools/Makefile
+Index: madwifi-trunk-r3314/tools/Makefile
===================================================================
---- madwifi-dfs-r3012.orig/tools/Makefile 2007-12-12 23:38:16.976128701 +0100
-+++ madwifi-dfs-r3012/tools/Makefile 2007-12-12 23:38:32.084989703 +0100
+--- madwifi-trunk-r3314.orig/tools/Makefile 2008-02-20 18:10:46.295152602 +0100
++++ madwifi-trunk-r3314/tools/Makefile 2008-02-20 18:10:46.715176538 +0100
@@ -47,9 +47,12 @@
endif
install: $(ALL)
install -d $(DESTDIR)$(BINDIR)
-Index: madwifi-dfs-r3012/tools/wlanconfig.c
+Index: madwifi-trunk-r3314/tools/wlanconfig.c
===================================================================
---- madwifi-dfs-r3012.orig/tools/wlanconfig.c 2007-12-12 23:38:16.984129146 +0100
-+++ madwifi-dfs-r3012/tools/wlanconfig.c 2007-12-12 23:38:32.084989703 +0100
+--- madwifi-trunk-r3314.orig/tools/wlanconfig.c 2008-02-20 18:10:46.299152832 +0100
++++ madwifi-trunk-r3314/tools/wlanconfig.c 2008-02-20 18:10:46.715176538 +0100
@@ -62,6 +62,10 @@
#include "net80211/ieee80211_crypto.h"
#include "net80211/ieee80211_ioctl.h"
const char *ifname, *cmd;
unsigned char bnounit = 0;
char *if_base = NULL;
-Index: madwifi-dfs-r3012/tools/ath_info.c
+Index: madwifi-trunk-r3314/tools/ath_info.c
===================================================================
---- madwifi-dfs-r3012.orig/tools/ath_info.c 2007-12-12 23:38:16.992129610 +0100
-+++ madwifi-dfs-r3012/tools/ath_info.c 2007-12-12 23:38:32.084989703 +0100
+--- madwifi-trunk-r3314.orig/tools/ath_info.c 2008-02-20 18:10:46.311153513 +0100
++++ madwifi-trunk-r3314/tools/ath_info.c 2008-02-20 18:10:46.715176538 +0100
@@ -738,7 +738,12 @@
"unlawful radio transmissions!\n\n");
}