refresh madwifi patches using upstream style
SVN-Revision: 11351
This commit is contained in:
		@@ -1,7 +1,5 @@
 | 
			
		||||
Index: madwifi-trunk-r3314/tools/80211debug.c
 | 
			
		||||
===================================================================
 | 
			
		||||
--- madwifi-trunk-r3314.orig/tools/80211debug.c
 | 
			
		||||
+++ madwifi-trunk-r3314/tools/80211debug.c
 | 
			
		||||
--- a/tools/80211debug.c
 | 
			
		||||
+++ b/tools/80211debug.c
 | 
			
		||||
@@ -48,6 +48,7 @@
 | 
			
		||||
 #include <ctype.h>
 | 
			
		||||
 #include <getopt.h>
 | 
			
		||||
@@ -19,10 +17,8 @@ Index: madwifi-trunk-r3314/tools/80211debug.c
 | 
			
		||||
 {
 | 
			
		||||
 	const char *ifname = "ath0";
 | 
			
		||||
 	const char *cp, *tp;
 | 
			
		||||
Index: madwifi-trunk-r3314/tools/80211stats.c
 | 
			
		||||
===================================================================
 | 
			
		||||
--- madwifi-trunk-r3314.orig/tools/80211stats.c
 | 
			
		||||
+++ madwifi-trunk-r3314/tools/80211stats.c
 | 
			
		||||
--- a/tools/80211stats.c
 | 
			
		||||
+++ b/tools/80211stats.c
 | 
			
		||||
@@ -59,6 +59,7 @@
 | 
			
		||||
 #include "net80211/ieee80211.h"
 | 
			
		||||
 #include "net80211/ieee80211_crypto.h"
 | 
			
		||||
@@ -40,10 +36,8 @@ Index: madwifi-trunk-r3314/tools/80211stats.c
 | 
			
		||||
 {
 | 
			
		||||
 	int c, len;
 | 
			
		||||
 	struct ieee80211req_sta_info *si;
 | 
			
		||||
Index: madwifi-trunk-r3314/tools/athchans.c
 | 
			
		||||
===================================================================
 | 
			
		||||
--- madwifi-trunk-r3314.orig/tools/athchans.c
 | 
			
		||||
+++ madwifi-trunk-r3314/tools/athchans.c
 | 
			
		||||
--- a/tools/athchans.c
 | 
			
		||||
+++ b/tools/athchans.c
 | 
			
		||||
@@ -58,6 +58,7 @@
 | 
			
		||||
 #include "net80211/ieee80211.h"
 | 
			
		||||
 #include "net80211/ieee80211_crypto.h"
 | 
			
		||||
@@ -63,10 +57,8 @@ Index: madwifi-trunk-r3314/tools/athchans.c
 | 
			
		||||
 {
 | 
			
		||||
 	const char *ifname = "wifi0";
 | 
			
		||||
 	struct ieee80211req_chanlist chanlist;
 | 
			
		||||
Index: madwifi-trunk-r3314/tools/athctrl.c
 | 
			
		||||
===================================================================
 | 
			
		||||
--- madwifi-trunk-r3314.orig/tools/athctrl.c
 | 
			
		||||
+++ madwifi-trunk-r3314/tools/athctrl.c
 | 
			
		||||
--- a/tools/athctrl.c
 | 
			
		||||
+++ b/tools/athctrl.c
 | 
			
		||||
@@ -52,6 +52,7 @@
 | 
			
		||||
 #include <err.h>
 | 
			
		||||
 
 | 
			
		||||
@@ -84,10 +76,8 @@ Index: madwifi-trunk-r3314/tools/athctrl.c
 | 
			
		||||
 {
 | 
			
		||||
 	char device[IFNAMSIZ + 1];
 | 
			
		||||
 	int distance = -1;
 | 
			
		||||
Index: madwifi-trunk-r3314/tools/athdebug.c
 | 
			
		||||
===================================================================
 | 
			
		||||
--- madwifi-trunk-r3314.orig/tools/athdebug.c
 | 
			
		||||
+++ madwifi-trunk-r3314/tools/athdebug.c
 | 
			
		||||
--- a/tools/athdebug.c
 | 
			
		||||
+++ b/tools/athdebug.c
 | 
			
		||||
@@ -51,6 +51,7 @@
 | 
			
		||||
 #include <ctype.h>
 | 
			
		||||
 #include <getopt.h>
 | 
			
		||||
@@ -105,10 +95,8 @@ Index: madwifi-trunk-r3314/tools/athdebug.c
 | 
			
		||||
 {
 | 
			
		||||
 #ifdef __linux__
 | 
			
		||||
 	const char *ifname = "wifi0";
 | 
			
		||||
Index: madwifi-trunk-r3314/tools/athkey.c
 | 
			
		||||
===================================================================
 | 
			
		||||
--- madwifi-trunk-r3314.orig/tools/athkey.c
 | 
			
		||||
+++ madwifi-trunk-r3314/tools/athkey.c
 | 
			
		||||
--- a/tools/athkey.c
 | 
			
		||||
+++ b/tools/athkey.c
 | 
			
		||||
@@ -58,6 +58,7 @@
 | 
			
		||||
 #include "net80211/ieee80211.h"
 | 
			
		||||
 #include "net80211/ieee80211_crypto.h"
 | 
			
		||||
@@ -127,10 +115,8 @@ Index: madwifi-trunk-r3314/tools/athkey.c
 | 
			
		||||
 {
 | 
			
		||||
 	const char *ifname = "wifi0";
 | 
			
		||||
 	struct ieee80211req_key setkey;
 | 
			
		||||
Index: madwifi-trunk-r3314/tools/athstats.c
 | 
			
		||||
===================================================================
 | 
			
		||||
--- madwifi-trunk-r3314.orig/tools/athstats.c
 | 
			
		||||
+++ madwifi-trunk-r3314/tools/athstats.c
 | 
			
		||||
--- a/tools/athstats.c
 | 
			
		||||
+++ b/tools/athstats.c
 | 
			
		||||
@@ -65,6 +65,7 @@
 | 
			
		||||
 
 | 
			
		||||
 #undef ARRAY_SIZE
 | 
			
		||||
@@ -148,10 +134,8 @@ Index: madwifi-trunk-r3314/tools/athstats.c
 | 
			
		||||
 {
 | 
			
		||||
 #ifdef __linux__
 | 
			
		||||
 	const char *ifname = "wifi0";
 | 
			
		||||
Index: madwifi-trunk-r3314/tools/do_multi.c
 | 
			
		||||
===================================================================
 | 
			
		||||
--- /dev/null
 | 
			
		||||
+++ madwifi-trunk-r3314/tools/do_multi.c
 | 
			
		||||
+++ b/tools/do_multi.c
 | 
			
		||||
@@ -0,0 +1,32 @@
 | 
			
		||||
+#include <string.h>
 | 
			
		||||
+#include "do_multi.h"
 | 
			
		||||
@@ -185,10 +169,8 @@ Index: madwifi-trunk-r3314/tools/do_multi.c
 | 
			
		||||
+
 | 
			
		||||
+    return ret;
 | 
			
		||||
+}
 | 
			
		||||
Index: madwifi-trunk-r3314/tools/do_multi.h
 | 
			
		||||
===================================================================
 | 
			
		||||
--- /dev/null
 | 
			
		||||
+++ madwifi-trunk-r3314/tools/do_multi.h
 | 
			
		||||
+++ b/tools/do_multi.h
 | 
			
		||||
@@ -0,0 +1,15 @@
 | 
			
		||||
+#ifdef DO_MULTI
 | 
			
		||||
+int a80211debug_init(int argc, char *argv[]);
 | 
			
		||||
@@ -205,10 +187,8 @@ Index: madwifi-trunk-r3314/tools/do_multi.h
 | 
			
		||||
+#else
 | 
			
		||||
+#define CMD(name) main
 | 
			
		||||
+#endif
 | 
			
		||||
Index: madwifi-trunk-r3314/tools/Makefile
 | 
			
		||||
===================================================================
 | 
			
		||||
--- madwifi-trunk-r3314.orig/tools/Makefile
 | 
			
		||||
+++ madwifi-trunk-r3314/tools/Makefile
 | 
			
		||||
--- a/tools/Makefile
 | 
			
		||||
+++ b/tools/Makefile
 | 
			
		||||
@@ -46,56 +46,55 @@
 | 
			
		||||
 HAL=   $(TOP)/hal
 | 
			
		||||
 endif
 | 
			
		||||
@@ -293,10 +273,8 @@ Index: madwifi-trunk-r3314/tools/Makefile
 | 
			
		||||
 clean:
 | 
			
		||||
-	rm -f $(ALL) core a.out
 | 
			
		||||
+	rm -f $(ALLPROGS) madwifi_multi *.o core a.out
 | 
			
		||||
Index: madwifi-trunk-r3314/tools/wlanconfig.c
 | 
			
		||||
===================================================================
 | 
			
		||||
--- madwifi-trunk-r3314.orig/tools/wlanconfig.c
 | 
			
		||||
+++ madwifi-trunk-r3314/tools/wlanconfig.c
 | 
			
		||||
--- a/tools/wlanconfig.c
 | 
			
		||||
+++ b/tools/wlanconfig.c
 | 
			
		||||
@@ -61,6 +61,7 @@
 | 
			
		||||
 #include "net80211/ieee80211.h"
 | 
			
		||||
 #include "net80211/ieee80211_crypto.h"
 | 
			
		||||
@@ -314,10 +292,8 @@ Index: madwifi-trunk-r3314/tools/wlanconfig.c
 | 
			
		||||
 {
 | 
			
		||||
 	const char *ifname, *cmd;
 | 
			
		||||
 	unsigned char bnounit = 0;
 | 
			
		||||
Index: madwifi-trunk-r3314/tools/ath_info.c
 | 
			
		||||
===================================================================
 | 
			
		||||
--- madwifi-trunk-r3314.orig/tools/ath_info.c
 | 
			
		||||
+++ madwifi-trunk-r3314/tools/ath_info.c
 | 
			
		||||
--- a/tools/ath_info.c
 | 
			
		||||
+++ b/tools/ath_info.c
 | 
			
		||||
@@ -98,6 +98,7 @@
 | 
			
		||||
 #include <sys/mman.h>
 | 
			
		||||
 #include <endian.h>
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user