X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/5ae7e31f6f37c24f9c87a4f8c5b9fbdfa9de55ae..123751454e9f50919c861d4c0d427cf2779dda7f:/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 4937ee33a..b461e91a3 100644
--- a/package/madwifi/patches/102-multicall_binary.patch
+++ b/package/madwifi/patches/102-multicall_binary.patch
@@ -1,7 +1,7 @@
-Index: madwifi-ng-r2756-20071018/tools/80211debug.c
+Index: madwifi-trunk-r3314/tools/80211debug.c
 ===================================================================
---- madwifi-ng-r2756-20071018.orig/tools/80211debug.c	2007-10-24 06:20:16.793646294 +0200
-+++ madwifi-ng-r2756-20071018/tools/80211debug.c	2007-10-24 06:20:17.233671372 +0200
+--- 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>
@@ -10,10 +10,10 @@ Index: madwifi-ng-r2756-20071018/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-r2756-20071018/tools/80211debug.c
  	const char *ifname = "ath0";
  	const char *cp, *tp;
  	const char *sep;
-Index: madwifi-ng-r2756-20071018/tools/80211stats.c
+Index: madwifi-trunk-r3314/tools/80211stats.c
 ===================================================================
---- madwifi-ng-r2756-20071018.orig/tools/80211stats.c	2007-10-24 06:20:16.801646748 +0200
-+++ madwifi-ng-r2756-20071018/tools/80211stats.c	2007-10-24 06:20:17.233671372 +0200
+--- 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"
@@ -48,7 +48,7 @@ Index: madwifi-ng-r2756-20071018/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-r2756-20071018/tools/80211stats.c
  	int c, len;
  	struct ieee80211req_sta_info *si;
  	u_int8_t buf[24*1024], *cp;
-Index: madwifi-ng-r2756-20071018/tools/athchans.c
+Index: madwifi-trunk-r3314/tools/athchans.c
 ===================================================================
---- madwifi-ng-r2756-20071018.orig/tools/athchans.c	2007-10-24 06:20:16.805646977 +0200
-+++ madwifi-ng-r2756-20071018/tools/athchans.c	2007-10-24 06:20:17.241671823 +0200
+--- 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"
@@ -83,7 +83,7 @@ Index: madwifi-ng-r2756-20071018/tools/athchans.c
  static	int s = -1;
  static const char *progname;
  
-@@ -139,9 +143,20 @@
+@@ -140,9 +144,20 @@
  }
  
  #define	MAXCHAN	((int)(sizeof(struct ieee80211req_chanlist) * NBBY))
@@ -104,10 +104,10 @@ Index: madwifi-ng-r2756-20071018/tools/athchans.c
  	const char *ifname = "wifi0";
  	struct ieee80211req_chanlist chanlist;
  	int c;
-Index: madwifi-ng-r2756-20071018/tools/athctrl.c
+Index: madwifi-trunk-r3314/tools/athctrl.c
 ===================================================================
---- madwifi-ng-r2756-20071018.orig/tools/athctrl.c	2007-10-24 06:20:16.813647434 +0200
-+++ madwifi-ng-r2756-20071018/tools/athctrl.c	2007-10-24 06:20:17.245672052 +0200
+--- 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>
@@ -139,10 +139,10 @@ Index: madwifi-ng-r2756-20071018/tools/athctrl.c
  	char device[IFNAMSIZ + 1];
  	int distance = -1;
  	int c;
-Index: madwifi-ng-r2756-20071018/tools/athdebug.c
+Index: madwifi-trunk-r3314/tools/athdebug.c
 ===================================================================
---- madwifi-ng-r2756-20071018.orig/tools/athdebug.c	2007-10-24 06:20:16.821647888 +0200
-+++ madwifi-ng-r2756-20071018/tools/athdebug.c	2007-10-24 06:20:17.249672281 +0200
+--- 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>
@@ -151,10 +151,10 @@ Index: madwifi-ng-r2756-20071018/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-r2756-20071018/tools/athdebug.c
  #ifdef __linux__
  	const char *ifname = "wifi0";
  #else
-Index: madwifi-ng-r2756-20071018/tools/athkey.c
+Index: madwifi-trunk-r3314/tools/athkey.c
 ===================================================================
---- madwifi-ng-r2756-20071018.orig/tools/athkey.c	2007-10-24 06:20:16.825648116 +0200
-+++ madwifi-ng-r2756-20071018/tools/athkey.c	2007-10-24 06:20:17.249672281 +0200
+--- 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"
@@ -190,7 +190,7 @@ Index: madwifi-ng-r2756-20071018/tools/athkey.c
  static int s = -1;
  static const char *progname;
  
-@@ -212,9 +216,19 @@
+@@ -213,9 +217,19 @@
  	exit(-1);
  }
  
@@ -210,13 +210,13 @@ Index: madwifi-ng-r2756-20071018/tools/athkey.c
  	const char *ifname = "wifi0";
  	struct ieee80211req_key setkey;
  	struct ieee80211req_del_key delkey;
-Index: madwifi-ng-r2756-20071018/tools/athstats.c
+Index: madwifi-trunk-r3314/tools/athstats.c
 ===================================================================
---- madwifi-ng-r2756-20071018.orig/tools/athstats.c	2007-10-24 06:20:16.833648573 +0200
-+++ madwifi-ng-r2756-20071018/tools/athstats.c	2007-10-24 06:20:17.249672281 +0200
-@@ -63,6 +63,10 @@
- #include "wireless_copy.h"
- #include "if_athioctl.h"
+--- 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 DOMULTI
 +#include "do_multi.h"
@@ -225,7 +225,7 @@ Index: madwifi-ng-r2756-20071018/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-r2756-20071018/tools/athstats.c
  #ifdef __linux__
  	const char *ifname = "wifi0";
  #else
-Index: madwifi-ng-r2756-20071018/tools/do_multi.c
+Index: madwifi-trunk-r3314/tools/do_multi.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ madwifi-ng-r2756-20071018/tools/do_multi.c	2007-10-24 06:20:17.249672281 +0200
++++ 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"
@@ -283,10 +283,10 @@ Index: madwifi-ng-r2756-20071018/tools/do_multi.c
 +
 +    return ret;
 +}
-Index: madwifi-ng-r2756-20071018/tools/do_multi.h
+Index: madwifi-trunk-r3314/tools/do_multi.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ madwifi-ng-r2756-20071018/tools/do_multi.h	2007-10-24 06:20:17.249672281 +0200
++++ 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[]);
@@ -298,10 +298,10 @@ Index: madwifi-ng-r2756-20071018/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-r2756-20071018/tools/Makefile
+Index: madwifi-trunk-r3314/tools/Makefile
 ===================================================================
---- madwifi-ng-r2756-20071018.orig/tools/Makefile	2007-10-24 06:20:16.849649487 +0200
-+++ madwifi-ng-r2756-20071018/tools/Makefile	2007-10-24 06:20:17.253672511 +0200
+--- 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
  
@@ -367,10 +367,10 @@ Index: madwifi-ng-r2756-20071018/tools/Makefile
  
  install: $(ALL) 
  	install -d $(DESTDIR)$(BINDIR)
-Index: madwifi-ng-r2756-20071018/tools/wlanconfig.c
+Index: madwifi-trunk-r3314/tools/wlanconfig.c
 ===================================================================
---- madwifi-ng-r2756-20071018.orig/tools/wlanconfig.c	2007-10-24 06:20:16.857649938 +0200
-+++ madwifi-ng-r2756-20071018/tools/wlanconfig.c	2007-10-24 06:20:17.253672511 +0200
+--- 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"
@@ -382,7 +382,7 @@ Index: madwifi-ng-r2756-20071018/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-r2756-20071018/tools/wlanconfig.c
  	const char *ifname, *cmd;
  	unsigned char bnounit = 0;
  	char *if_base = NULL;
-Index: madwifi-ng-r2756-20071018/tools/ath_info.c
+Index: madwifi-trunk-r3314/tools/ath_info.c
 ===================================================================
---- madwifi-ng-r2756-20071018.orig/tools/ath_info.c	2007-10-24 06:20:16.865650396 +0200
-+++ madwifi-ng-r2756-20071018/tools/ath_info.c	2007-10-24 06:20:17.253672511 +0200
-@@ -722,8 +722,13 @@
+--- 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");
  }
  
@@ -414,8 +414,7 @@ Index: madwifi-ng-r2756-20071018/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;