X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/1152b725a15d6965cfb0c0f1aa284d97bca9bf36..379d926d214f384ab4591566ee4e29f32b10b4ee:/package/madwifi/patches/102-multicall_binary.patch

diff --git a/package/madwifi/patches/102-multicall_binary.patch b/package/madwifi/patches/102-multicall_binary.patch
index e5eb0d2df..cdbc0eb15 100644
--- a/package/madwifi/patches/102-multicall_binary.patch
+++ b/package/madwifi/patches/102-multicall_binary.patch
@@ -1,7 +1,7 @@
-Index: madwifi-ng-r2799-20071030/tools/80211debug.c
+Index: madwifi-dfs-r3053/tools/80211debug.c
 ===================================================================
---- madwifi-ng-r2799-20071030.orig/tools/80211debug.c	2007-10-31 14:04:46.925295598 +0100
-+++ madwifi-ng-r2799-20071030/tools/80211debug.c	2007-10-31 14:04:47.537330476 +0100
+--- madwifi-dfs-r3053.orig/tools/80211debug.c	2007-12-13 05:25:10.786240140 +0100
++++ madwifi-dfs-r3053/tools/80211debug.c	2007-12-13 05:25:11.226265215 +0100
 @@ -49,6 +49,10 @@
  #include <getopt.h>
  #include <err.h>
@@ -10,10 +10,10 @@ Index: madwifi-ng-r2799-20071030/tools/80211debug.c
 +#include "do_multi.h"
 +#endif
 +
- #define	N(a)	(sizeof(a)/sizeof(a[0]))
+ #undef ARRAY_SIZE
+ #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
  
- static const char *progname;
-@@ -180,9 +184,19 @@
+@@ -184,9 +188,19 @@
  }
  #endif /* __linux__ */
  
@@ -33,10 +33,10 @@ Index: madwifi-ng-r2799-20071030/tools/80211debug.c
  	const char *ifname = "ath0";
  	const char *cp, *tp;
  	const char *sep;
-Index: madwifi-ng-r2799-20071030/tools/80211stats.c
+Index: madwifi-dfs-r3053/tools/80211stats.c
 ===================================================================
---- madwifi-ng-r2799-20071030.orig/tools/80211stats.c	2007-10-31 14:04:46.929295827 +0100
-+++ madwifi-ng-r2799-20071030/tools/80211stats.c	2007-10-31 14:04:47.537330476 +0100
+--- madwifi-dfs-r3053.orig/tools/80211stats.c	2007-12-13 05:25:10.794240595 +0100
++++ madwifi-dfs-r3053/tools/80211stats.c	2007-12-13 05:25:11.226265215 +0100
 @@ -60,6 +60,10 @@
  #include "net80211/ieee80211_crypto.h"
  #include "net80211/ieee80211_ioctl.h"
@@ -48,7 +48,7 @@ Index: madwifi-ng-r2799-20071030/tools/80211stats.c
  #ifndef SIOCG80211STATS
  #define	SIOCG80211STATS	(SIOCDEVPRIVATE + 2)
  #endif
-@@ -241,9 +245,19 @@
+@@ -239,9 +243,19 @@
  #undef STAT
  }
  
@@ -68,10 +68,10 @@ Index: madwifi-ng-r2799-20071030/tools/80211stats.c
  	int c, len;
  	struct ieee80211req_sta_info *si;
  	u_int8_t buf[24*1024], *cp;
-Index: madwifi-ng-r2799-20071030/tools/athchans.c
+Index: madwifi-dfs-r3053/tools/athchans.c
 ===================================================================
---- madwifi-ng-r2799-20071030.orig/tools/athchans.c	2007-10-31 14:04:46.937296283 +0100
-+++ madwifi-ng-r2799-20071030/tools/athchans.c	2007-10-31 14:04:47.545330932 +0100
+--- madwifi-dfs-r3053.orig/tools/athchans.c	2007-12-13 05:25:10.798240825 +0100
++++ madwifi-dfs-r3053/tools/athchans.c	2007-12-13 05:25:11.238265900 +0100
 @@ -59,6 +59,10 @@
  #include "net80211/ieee80211_crypto.h"
  #include "net80211/ieee80211_ioctl.h"
@@ -104,10 +104,10 @@ Index: madwifi-ng-r2799-20071030/tools/athchans.c
  	const char *ifname = "wifi0";
  	struct ieee80211req_chanlist chanlist;
  	int c;
-Index: madwifi-ng-r2799-20071030/tools/athctrl.c
+Index: madwifi-dfs-r3053/tools/athctrl.c
 ===================================================================
---- madwifi-ng-r2799-20071030.orig/tools/athctrl.c	2007-10-31 14:04:46.945296738 +0100
-+++ madwifi-ng-r2799-20071030/tools/athctrl.c	2007-10-31 14:04:47.549331161 +0100
+--- madwifi-dfs-r3053.orig/tools/athctrl.c	2007-12-13 05:25:10.806241280 +0100
++++ madwifi-dfs-r3053/tools/athctrl.c	2007-12-13 05:25:11.242266126 +0100
 @@ -53,6 +53,10 @@
  
  #include <net/if.h>
@@ -139,10 +139,10 @@ Index: madwifi-ng-r2799-20071030/tools/athctrl.c
  	char device[IFNAMSIZ + 1];
  	int distance = -1;
  	int c;
-Index: madwifi-ng-r2799-20071030/tools/athdebug.c
+Index: madwifi-dfs-r3053/tools/athdebug.c
 ===================================================================
---- madwifi-ng-r2799-20071030.orig/tools/athdebug.c	2007-10-31 14:04:46.953297193 +0100
-+++ madwifi-ng-r2799-20071030/tools/athdebug.c	2007-10-31 14:04:47.557331616 +0100
+--- madwifi-dfs-r3053.orig/tools/athdebug.c	2007-12-13 05:25:10.814241735 +0100
++++ madwifi-dfs-r3053/tools/athdebug.c	2007-12-13 05:25:11.242266126 +0100
 @@ -52,6 +52,10 @@
  #include <getopt.h>
  #include <err.h>
@@ -151,10 +151,10 @@ Index: madwifi-ng-r2799-20071030/tools/athdebug.c
 +#include "do_multi.h"
 +#endif
 +
- #define	N(a)	(sizeof(a)/sizeof(a[0]))
+ #undef ARRAY_SIZE
+ #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
  
- static const char *progname;
-@@ -187,9 +191,20 @@
+@@ -193,9 +197,20 @@
  }
  #endif /* __linux__ */
  
@@ -175,10 +175,10 @@ Index: madwifi-ng-r2799-20071030/tools/athdebug.c
  #ifdef __linux__
  	const char *ifname = "wifi0";
  #else
-Index: madwifi-ng-r2799-20071030/tools/athkey.c
+Index: madwifi-dfs-r3053/tools/athkey.c
 ===================================================================
---- madwifi-ng-r2799-20071030.orig/tools/athkey.c	2007-10-31 14:04:46.957297422 +0100
-+++ madwifi-ng-r2799-20071030/tools/athkey.c	2007-10-31 14:04:47.557331616 +0100
+--- madwifi-dfs-r3053.orig/tools/athkey.c	2007-12-13 05:25:10.818241964 +0100
++++ madwifi-dfs-r3053/tools/athkey.c	2007-12-13 05:25:11.242266126 +0100
 @@ -59,6 +59,10 @@
  #include "net80211/ieee80211_crypto.h"
  #include "net80211/ieee80211_ioctl.h"
@@ -210,13 +210,13 @@ Index: madwifi-ng-r2799-20071030/tools/athkey.c
  	const char *ifname = "wifi0";
  	struct ieee80211req_key setkey;
  	struct ieee80211req_del_key delkey;
-Index: madwifi-ng-r2799-20071030/tools/athstats.c
+Index: madwifi-dfs-r3053/tools/athstats.c
 ===================================================================
---- madwifi-ng-r2799-20071030.orig/tools/athstats.c	2007-10-31 14:04:46.965297878 +0100
-+++ madwifi-ng-r2799-20071030/tools/athstats.c	2007-10-31 14:04:47.557331616 +0100
-@@ -63,6 +63,10 @@
- #include "wireless_copy.h"
- #include "if_athioctl.h"
+--- madwifi-dfs-r3053.orig/tools/athstats.c	2007-12-13 05:25:10.826242419 +0100
++++ madwifi-dfs-r3053/tools/athstats.c	2007-12-13 05:25:11.242266126 +0100
+@@ -66,6 +66,10 @@
+ #undef ARRAY_SIZE
+ #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
  
 +#ifdef DOMULTI
 +#include "do_multi.h"
@@ -225,7 +225,7 @@ Index: madwifi-ng-r2799-20071030/tools/athstats.c
  static const struct {
  	u_int		phyerr;
  	const char*	desc;
-@@ -226,9 +230,20 @@
+@@ -227,9 +231,20 @@
  	signalled = 1;
  }
  
@@ -246,10 +246,10 @@ Index: madwifi-ng-r2799-20071030/tools/athstats.c
  #ifdef __linux__
  	const char *ifname = "wifi0";
  #else
-Index: madwifi-ng-r2799-20071030/tools/do_multi.c
+Index: madwifi-dfs-r3053/tools/do_multi.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ madwifi-ng-r2799-20071030/tools/do_multi.c	2007-10-31 14:04:47.557331616 +0100
++++ madwifi-dfs-r3053/tools/do_multi.c	2007-12-13 05:25:11.242266126 +0100
 @@ -0,0 +1,32 @@
 +#include <string.h>
 +#include "do_multi.h"
@@ -283,10 +283,10 @@ Index: madwifi-ng-r2799-20071030/tools/do_multi.c
 +
 +    return ret;
 +}
-Index: madwifi-ng-r2799-20071030/tools/do_multi.h
+Index: madwifi-dfs-r3053/tools/do_multi.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ madwifi-ng-r2799-20071030/tools/do_multi.h	2007-10-31 14:04:47.557331616 +0100
++++ madwifi-dfs-r3053/tools/do_multi.h	2007-12-13 05:25:11.246266355 +0100
 @@ -0,0 +1,10 @@
 +
 +int a80211debug_init(int argc, char *argv[]);
@@ -298,10 +298,10 @@ Index: madwifi-ng-r2799-20071030/tools/do_multi.h
 +int athstats_init(int argc, char *argv[]);
 +int wlanconfig_init(int argc, char *argv[]);
 +int athinfo_init(int argc, char *argv[]);
-Index: madwifi-ng-r2799-20071030/tools/Makefile
+Index: madwifi-dfs-r3053/tools/Makefile
 ===================================================================
---- madwifi-ng-r2799-20071030.orig/tools/Makefile	2007-10-31 14:04:46.981298791 +0100
-+++ madwifi-ng-r2799-20071030/tools/Makefile	2007-10-31 14:04:47.561331846 +0100
+--- madwifi-dfs-r3053.orig/tools/Makefile	2007-12-13 05:25:10.842243330 +0100
++++ madwifi-dfs-r3053/tools/Makefile	2007-12-13 05:25:11.246266355 +0100
 @@ -47,9 +47,12 @@
  endif
  
@@ -367,10 +367,10 @@ Index: madwifi-ng-r2799-20071030/tools/Makefile
  
  install: $(ALL) 
  	install -d $(DESTDIR)$(BINDIR)
-Index: madwifi-ng-r2799-20071030/tools/wlanconfig.c
+Index: madwifi-dfs-r3053/tools/wlanconfig.c
 ===================================================================
---- madwifi-ng-r2799-20071030.orig/tools/wlanconfig.c	2007-10-31 14:04:46.989299247 +0100
-+++ madwifi-ng-r2799-20071030/tools/wlanconfig.c	2007-10-31 14:04:47.561331846 +0100
+--- madwifi-dfs-r3053.orig/tools/wlanconfig.c	2007-12-13 05:25:10.850243788 +0100
++++ madwifi-dfs-r3053/tools/wlanconfig.c	2007-12-13 05:25:11.246266355 +0100
 @@ -62,6 +62,10 @@
  #include "net80211/ieee80211_crypto.h"
  #include "net80211/ieee80211_ioctl.h"
@@ -382,7 +382,7 @@ Index: madwifi-ng-r2799-20071030/tools/wlanconfig.c
  /*
   * These are taken from ieee80211_node.h
   */
-@@ -96,9 +100,19 @@
+@@ -99,9 +103,19 @@
  
  static int verbose = 0;
  
@@ -402,11 +402,11 @@ Index: madwifi-ng-r2799-20071030/tools/wlanconfig.c
  	const char *ifname, *cmd;
  	unsigned char bnounit = 0;
  	char *if_base = NULL;
-Index: madwifi-ng-r2799-20071030/tools/ath_info.c
+Index: madwifi-dfs-r3053/tools/ath_info.c
 ===================================================================
---- madwifi-ng-r2799-20071030.orig/tools/ath_info.c	2007-10-31 14:04:46.997299702 +0100
-+++ madwifi-ng-r2799-20071030/tools/ath_info.c	2007-10-31 14:04:47.561331846 +0100
-@@ -722,8 +722,13 @@
+--- madwifi-dfs-r3053.orig/tools/ath_info.c	2007-12-13 05:25:10.858244244 +0100
++++ madwifi-dfs-r3053/tools/ath_info.c	2007-12-13 05:25:11.246266355 +0100
+@@ -738,7 +738,12 @@
  		"unlawful radio transmissions!\n\n");
  }
  
@@ -414,8 +414,7 @@ Index: madwifi-ng-r2799-20071030/tools/ath_info.c
 +int
 +athinfo_init(int argc, char *argv[])
 +#else
- int
- main(int argc, char *argv[])
+ int main(int argc, char *argv[])
 +#endif
  {
  	u_int32_t dev_addr;