forgot to bump up the release version from the patches the other day

[openwrt.git] / 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 8fa6567..e5eb0d2 100644 (file)
--- a/package/madwifi/patches/102-multicall_binary.patch
+++ b/package/madwifi/patches/102-multicall_binary.patch
@@ -1,6 +1,7 @@
-diff -urN madwifi-0.9.2.old/tools/80211debug.c madwifi-0.9.2.dev/tools/80211debug.c
---- madwifi-0.9.2.old/tools/80211debug.c       2006-03-10 14:23:50.000000000 +0100
-+++ madwifi-0.9.2.dev/tools/80211debug.c       2006-08-29 17:49:50.000000000 +0200
+Index: madwifi-ng-r2799-20071030/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

 @@ -49,6 +49,10 @@
  #include <getopt.h>
  #include <err.h>
 @@ -49,6 +49,10 @@
  #include <getopt.h>
  #include <err.h>


@@ -11,7 +12,7 @@ diff -urN madwifi-0.9.2.old/tools/80211debug.c madwifi-0.9.2.dev/tools/80211debu
 +
  #define       N(a)    (sizeof(a)/sizeof(a[0]))
  
 +
  #define       N(a)    (sizeof(a)/sizeof(a[0]))
  

- const char *progname;
+ static const char *progname;

 @@ -180,9 +184,19 @@
  }
  #endif /* __linux__ */
 @@ -180,9 +184,19 @@
  }
  #endif /* __linux__ */


@@ -32,10 +33,11 @@ diff -urN madwifi-0.9.2.old/tools/80211debug.c madwifi-0.9.2.dev/tools/80211debu
        const char *ifname = "ath0";
        const char *cp, *tp;
        const char *sep;
        const char *ifname = "ath0";
        const char *cp, *tp;
        const char *sep;

-diff -urN madwifi-0.9.2.old/tools/80211stats.c madwifi-0.9.2.dev/tools/80211stats.c
---- madwifi-0.9.2.old/tools/80211stats.c       2006-05-27 08:21:18.000000000 +0200
-+++ madwifi-0.9.2.dev/tools/80211stats.c       2006-08-29 17:49:50.000000000 +0200
-@@ -58,6 +58,10 @@
+Index: madwifi-ng-r2799-20071030/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
+@@ -60,6 +60,10 @@

  #include "net80211/ieee80211_crypto.h"
  #include "net80211/ieee80211_ioctl.h"
  
  #include "net80211/ieee80211_crypto.h"
  #include "net80211/ieee80211_ioctl.h"
  


@@ -66,10 +68,11 @@ diff -urN madwifi-0.9.2.old/tools/80211stats.c madwifi-0.9.2.dev/tools/80211stat
        int c, len;
        struct ieee80211req_sta_info *si;
        u_int8_t buf[24*1024], *cp;
        int c, len;
        struct ieee80211req_sta_info *si;
        u_int8_t buf[24*1024], *cp;

-diff -urN madwifi-0.9.2.old/tools/athchans.c madwifi-0.9.2.dev/tools/athchans.c
---- madwifi-0.9.2.old/tools/athchans.c 2006-02-01 21:07:11.000000000 +0100
-+++ madwifi-0.9.2.dev/tools/athchans.c 2006-08-29 17:49:50.000000000 +0200
-@@ -57,6 +57,10 @@
+Index: madwifi-ng-r2799-20071030/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
+@@ -59,6 +59,10 @@

  #include "net80211/ieee80211_crypto.h"
  #include "net80211/ieee80211_ioctl.h"
  
  #include "net80211/ieee80211_crypto.h"
  #include "net80211/ieee80211_ioctl.h"
  


@@ -78,9 +81,9 @@ diff -urN madwifi-0.9.2.old/tools/athchans.c madwifi-0.9.2.dev/tools/athchans.c
 +#endif
 +
  static        int s = -1;
 +#endif
 +
  static        int s = -1;

- const char *progname;
+ static const char *progname;

  
  

-@@ -134,9 +138,20 @@
+@@ -139,9 +143,20 @@

  }
  
  #define       MAXCHAN ((int)(sizeof(struct ieee80211req_chanlist) * NBBY))
  }
  
  #define       MAXCHAN ((int)(sizeof(struct ieee80211req_chanlist) * NBBY))


@@ -101,9 +104,10 @@ diff -urN madwifi-0.9.2.old/tools/athchans.c madwifi-0.9.2.dev/tools/athchans.c
        const char *ifname = "wifi0";
        struct ieee80211req_chanlist chanlist;
        int c;
        const char *ifname = "wifi0";
        struct ieee80211req_chanlist chanlist;
        int c;

-diff -urN madwifi-0.9.2.old/tools/athctrl.c madwifi-0.9.2.dev/tools/athctrl.c
---- madwifi-0.9.2.old/tools/athctrl.c  2006-02-03 13:03:03.000000000 +0100
-+++ madwifi-0.9.2.dev/tools/athctrl.c  2006-08-29 17:49:50.000000000 +0200
+Index: madwifi-ng-r2799-20071030/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

 @@ -53,6 +53,10 @@
  
  #include <net/if.h>
 @@ -53,6 +53,10 @@
  
  #include <net/if.h>


@@ -116,7 +120,7 @@ diff -urN madwifi-0.9.2.old/tools/athctrl.c madwifi-0.9.2.dev/tools/athctrl.c
  setsysctrl(const char *dev, const char *control , u_long value)
  {
 @@ -87,9 +91,19 @@
  setsysctrl(const char *dev, const char *control , u_long value)
  {
 @@ -87,9 +91,19 @@

-     exit(1);
+       exit(1);

  }
  
 +#ifdef DOMULTI
  }
  
 +#ifdef DOMULTI


@@ -135,9 +139,10 @@ diff -urN madwifi-0.9.2.old/tools/athctrl.c madwifi-0.9.2.dev/tools/athctrl.c
        char device[IFNAMSIZ + 1];
        int distance = -1;
        int c;
        char device[IFNAMSIZ + 1];
        int distance = -1;
        int c;

-diff -urN madwifi-0.9.2.old/tools/athdebug.c madwifi-0.9.2.dev/tools/athdebug.c
---- madwifi-0.9.2.old/tools/athdebug.c 2006-05-05 06:17:59.000000000 +0200
-+++ madwifi-0.9.2.dev/tools/athdebug.c 2006-08-29 17:49:50.000000000 +0200
+Index: madwifi-ng-r2799-20071030/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

 @@ -52,6 +52,10 @@
  #include <getopt.h>
  #include <err.h>
 @@ -52,6 +52,10 @@
  #include <getopt.h>
  #include <err.h>


@@ -148,8 +153,8 @@ diff -urN madwifi-0.9.2.old/tools/athdebug.c madwifi-0.9.2.dev/tools/athdebug.c
 +
  #define       N(a)    (sizeof(a)/sizeof(a[0]))
  
 +
  #define       N(a)    (sizeof(a)/sizeof(a[0]))
  

- const char *progname;
-@@ -179,9 +183,20 @@
+ static const char *progname;
+@@ -187,9 +191,20 @@

  }
  #endif /* __linux__ */
  
  }
  #endif /* __linux__ */
  


@@ -170,10 +175,11 @@ diff -urN madwifi-0.9.2.old/tools/athdebug.c madwifi-0.9.2.dev/tools/athdebug.c
  #ifdef __linux__
        const char *ifname = "wifi0";
  #else
  #ifdef __linux__
        const char *ifname = "wifi0";
  #else

-diff -urN madwifi-0.9.2.old/tools/athkey.c madwifi-0.9.2.dev/tools/athkey.c
---- madwifi-0.9.2.old/tools/athkey.c   2006-02-01 21:07:11.000000000 +0100
-+++ madwifi-0.9.2.dev/tools/athkey.c   2006-08-29 17:49:50.000000000 +0200
-@@ -57,6 +57,10 @@
+Index: madwifi-ng-r2799-20071030/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
+@@ -59,6 +59,10 @@

  #include "net80211/ieee80211_crypto.h"
  #include "net80211/ieee80211_ioctl.h"
  
  #include "net80211/ieee80211_crypto.h"
  #include "net80211/ieee80211_ioctl.h"
  


@@ -182,9 +188,9 @@ diff -urN madwifi-0.9.2.old/tools/athkey.c madwifi-0.9.2.dev/tools/athkey.c
 +#endif
 +
  static int s = -1;
 +#endif
 +
  static int s = -1;

- const char *progname;
+ static const char *progname;

  
  

-@@ -207,9 +211,19 @@
+@@ -212,9 +216,19 @@

        exit(-1);
  }
  
        exit(-1);
  }
  


@@ -204,11 +210,12 @@ diff -urN madwifi-0.9.2.old/tools/athkey.c madwifi-0.9.2.dev/tools/athkey.c
        const char *ifname = "wifi0";
        struct ieee80211req_key setkey;
        struct ieee80211req_del_key delkey;
        const char *ifname = "wifi0";
        struct ieee80211req_key setkey;
        struct ieee80211req_del_key delkey;

-diff -urN madwifi-0.9.2.old/tools/athstats.c madwifi-0.9.2.dev/tools/athstats.c
---- madwifi-0.9.2.old/tools/athstats.c 2006-05-05 06:20:50.000000000 +0200
-+++ madwifi-0.9.2.dev/tools/athstats.c 2006-08-29 17:49:50.000000000 +0200
-@@ -64,6 +64,10 @@
- #include "ah_desc.h"
+Index: madwifi-ng-r2799-20071030/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"
  
 +#ifdef DOMULTI
  #include "if_athioctl.h"
  
 +#ifdef DOMULTI


@@ -218,7 +225,7 @@ diff -urN madwifi-0.9.2.old/tools/athstats.c madwifi-0.9.2.dev/tools/athstats.c
  static const struct {
        u_int           phyerr;
        const char*     desc;
  static const struct {
        u_int           phyerr;
        const char*     desc;

-@@ -227,9 +231,20 @@
+@@ -226,9 +230,20 @@

        signalled = 1;
  }
  
        signalled = 1;
  }
  


@@ -239,10 +246,11 @@ diff -urN madwifi-0.9.2.old/tools/athstats.c madwifi-0.9.2.dev/tools/athstats.c
  #ifdef __linux__
        const char *ifname = "wifi0";
  #else
  #ifdef __linux__
        const char *ifname = "wifi0";
  #else

-diff -urN madwifi-0.9.2.old/tools/do_multi.c madwifi-0.9.2.dev/tools/do_multi.c
---- madwifi-0.9.2.old/tools/do_multi.c 1970-01-01 01:00:00.000000000 +0100
-+++ madwifi-0.9.2.dev/tools/do_multi.c 2006-08-29 17:49:50.000000000 +0200
-@@ -0,0 +1,30 @@
+Index: madwifi-ng-r2799-20071030/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
+@@ -0,0 +1,32 @@

 +#include <string.h>
 +#include "do_multi.h"
 +
 +#include <string.h>
 +#include "do_multi.h"
 +


@@ -270,13 +278,16 @@ diff -urN madwifi-0.9.2.old/tools/do_multi.c madwifi-0.9.2.dev/tools/do_multi.c
 +      ret =  athstats_init(argc, argv);
 +    if(strcmp(progname, "wlanconfig") == 0)
 +      ret =  wlanconfig_init(argc, argv);
 +      ret =  athstats_init(argc, argv);
 +    if(strcmp(progname, "wlanconfig") == 0)
 +      ret =  wlanconfig_init(argc, argv);

-+    
++    if(strcmp(progname, "ath_info") == 0)
++      ret =  athinfo_init(argc, argv);
++

 +    return ret;
 +}
 +    return ret;
 +}

-diff -urN madwifi-0.9.2.old/tools/do_multi.h madwifi-0.9.2.dev/tools/do_multi.h
---- madwifi-0.9.2.old/tools/do_multi.h 1970-01-01 01:00:00.000000000 +0100
-+++ madwifi-0.9.2.dev/tools/do_multi.h 2006-08-29 17:49:50.000000000 +0200
-@@ -0,0 +1,9 @@
+Index: madwifi-ng-r2799-20071030/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
+@@ -0,0 +1,10 @@

 +
 +int a80211debug_init(int argc, char *argv[]);
 +int a80211stats_init(int argc, char *argv[]);
 +
 +int a80211debug_init(int argc, char *argv[]);
 +int a80211stats_init(int argc, char *argv[]);


@@ -286,30 +297,54 @@ diff -urN madwifi-0.9.2.old/tools/do_multi.h madwifi-0.9.2.dev/tools/do_multi.h
 +int athkey_init(int argc, char *argv[]);
 +int athstats_init(int argc, char *argv[]);
 +int wlanconfig_init(int argc, char *argv[]);
 +int athkey_init(int argc, char *argv[]);
 +int athstats_init(int argc, char *argv[]);
 +int wlanconfig_init(int argc, char *argv[]);

-diff -urN madwifi-0.9.2.old/tools/Makefile madwifi-0.9.2.dev/tools/Makefile
---- madwifi-0.9.2.old/tools/Makefile   2006-07-14 07:15:56.000000000 +0200
-+++ madwifi-0.9.2.dev/tools/Makefile   2006-08-29 17:49:50.000000000 +0200
-@@ -49,6 +49,12 @@
++int athinfo_init(int argc, char *argv[]);
+Index: madwifi-ng-r2799-20071030/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
+@@ -47,9 +47,12 @@
+ endif

  
  

- ALL=  athstats 80211stats athkey athchans athctrl \
-       athdebug 80211debug wlanconfig
-+      
-+ifdef DOMULTI
-+OBJS= do_multi.o athstats.o 80211stats.o athkey.o athchans.o athctrl.o \
-+      athdebug.o 80211debug.o wlanconfig.o 
-+ALL=  ${OBJS} madwifi_multi
-+endif

  
  

+-ALL=  athstats 80211stats athkey athchans athctrl \
++ALLPROGS=     athstats 80211stats athkey athchans athctrl \
+       athdebug 80211debug wlanconfig ath_info
+ 
++OBJS= $(patsubst %,%.o,$(ALLPROGS) do_multi)
++ALL=  ${OBJS} madwifi_multi
++

  all:  $(ALL)
  
  all:  $(ALL)
  

-@@ -59,6 +65,30 @@
+ INCS= -I. -I$(HAL) -I$(TOP) -I$(ATH_HAL)
+@@ -59,25 +62,31 @@

  
  all:  $(ALL)
  
  
  all:  $(ALL)
  

+-athstats: athstats.c
+-      $(CC) -o athstats $(ALL_CFLAGS) -I$(TOP)/ath $(LDFLAGS) athstats.c
+-80211stats: 80211stats.c
+-      $(CC) -o 80211stats $(ALL_CFLAGS) $(LDFLAGS) 80211stats.c
+-athkey: athkey.c
+-      $(CC) -o athkey $(ALL_CFLAGS) $(LDFLAGS) athkey.c
+-athchans: athchans.c
+-      $(CC) -o athchans $(ALL_CFLAGS) $(LDFLAGS) athchans.c
+-athctrl: athctrl.c
+-      $(CC) -o athctrl $(ALL_CFLAGS) $(LDFLAGS) athctrl.c
+-athdebug: athdebug.c
+-      $(CC) -o athdebug $(ALL_CFLAGS) $(LDFLAGS) athdebug.c
+-wlanconfig: wlanconfig.c
+-      $(CC) -o wlanconfig $(ALL_CFLAGS) $(LDFLAGS) wlanconfig.c
+-80211debug: 80211debug.c
+-      $(CC) -o 80211debug $(ALL_CFLAGS) $(LDFLAGS) 80211debug.c
+-ath_info: ath_info.c
+-      $(CC) -o ath_info $(CFLAGS) ath_info.c
+-

 +athstats.o: athstats.c
 +      ${CC} -c -o athstats.o -DDOMULTI=1 ${ALL_CFLAGS} -I../ath athstats.c
 +80211stats.o: 80211stats.c
 +      ${CC} -c -o 80211stats.o -DDOMULTI=1 ${ALL_CFLAGS} 80211stats.c
 +athstats.o: athstats.c
 +      ${CC} -c -o athstats.o -DDOMULTI=1 ${ALL_CFLAGS} -I../ath athstats.c
 +80211stats.o: 80211stats.c
 +      ${CC} -c -o 80211stats.o -DDOMULTI=1 ${ALL_CFLAGS} 80211stats.c

++ath_info.o: ath_info.c
++      ${CC} -c -o ath_info.o -DDOMULTI=1 ${ALL_CFLAGS} ath_info.c

 +athkey.o: athkey.c
 +      ${CC} -c -o athkey.o -DDOMULTI=1 ${ALL_CFLAGS} athkey.c
 +athchans.o: athchans.c
 +athkey.o: athkey.c
 +      ${CC} -c -o athkey.o -DDOMULTI=1 ${ALL_CFLAGS} athkey.c
 +athchans.o: athchans.c


@@ -324,19 +359,19 @@ diff -urN madwifi-0.9.2.old/tools/Makefile madwifi-0.9.2.dev/tools/Makefile
 +      ${CC} -c -o 80211debug.o -DDOMULTI=1 ${ALL_CFLAGS} 80211debug.c
 +do_multi.o: do_multi.c
 +      ${CC} -c -o do_multi.o -DDOMULTI=1 ${ALL_CFLAGS} do_multi.c
 +      ${CC} -c -o 80211debug.o -DDOMULTI=1 ${ALL_CFLAGS} 80211debug.c
 +do_multi.o: do_multi.c
 +      ${CC} -c -o do_multi.o -DDOMULTI=1 ${ALL_CFLAGS} do_multi.c

-+madwifi_multi:
++madwifi_multi: $(OBJS)

 +      ${CC} -o madwifi_multi ${LDFLAGS} ${OBJS}
 +      for i in athstats 80211stats athkey athchans athctrl athdebug wlanconfig 80211debug; do \
 +      ln -s -f madwifi_multi $$i; \
 +      done
 +      ${CC} -o madwifi_multi ${LDFLAGS} ${OBJS}
 +      for i in athstats 80211stats athkey athchans athctrl athdebug wlanconfig 80211debug; do \
 +      ln -s -f madwifi_multi $$i; \
 +      done

-+
- athstats: athstats.c
-       $(CC) -o athstats $(ALL_CFLAGS) -I../ath $(LDFLAGS) athstats.c
- 80211stats: 80211stats.c
-diff -urN madwifi-0.9.2.old/tools/wlanconfig.c madwifi-0.9.2.dev/tools/wlanconfig.c
---- madwifi-0.9.2.old/tools/wlanconfig.c       2006-05-14 09:17:29.000000000 +0200
-+++ madwifi-0.9.2.dev/tools/wlanconfig.c       2006-08-29 17:49:50.000000000 +0200
-@@ -60,6 +60,10 @@
+ 
+ install: $(ALL) 
+       install -d $(DESTDIR)$(BINDIR)
+Index: madwifi-ng-r2799-20071030/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
+@@ -62,6 +62,10 @@

  #include "net80211/ieee80211_crypto.h"
  #include "net80211/ieee80211_ioctl.h"
  
  #include "net80211/ieee80211_crypto.h"
  #include "net80211/ieee80211_ioctl.h"
  


@@ -349,7 +384,7 @@ diff -urN madwifi-0.9.2.old/tools/wlanconfig.c madwifi-0.9.2.dev/tools/wlanconfi
   */
 @@ -96,9 +100,19 @@
  
   */
 @@ -96,9 +100,19 @@
  

- int verbose = 0;
+ static int verbose = 0;

  
 +#ifdef DOMULTI
 +
  
 +#ifdef DOMULTI
 +


@@ -367,3 +402,21 @@ diff -urN madwifi-0.9.2.old/tools/wlanconfig.c madwifi-0.9.2.dev/tools/wlanconfi
        const char *ifname, *cmd;
        unsigned char bnounit = 0;
        char *if_base = NULL;
        const char *ifname, *cmd;
        unsigned char bnounit = 0;
        char *if_base = NULL;

+Index: madwifi-ng-r2799-20071030/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 @@
+               "unlawful radio transmissions!\n\n");
+ }
+ 
++#ifdef DOMULTI
++int
++athinfo_init(int argc, char *argv[])
++#else
+ int
+ main(int argc, char *argv[])
++#endif
+ {
+       u_int32_t dev_addr;
+       u_int16_t eeprom_header, srev, phy_rev_5ghz, phy_rev_2ghz;