bcm47xx compile fix for .21, thanks to noz

[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..27d1756 100644 (file)
--- a/package/madwifi/patches/102-multicall_binary.patch
+++ b/package/madwifi/patches/102-multicall_binary.patch
@@ -1,6 +1,6 @@
-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
+diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/80211debug.c madwifi-ng-refcount-r2313-20070505.dev/tools/80211debug.c
+--- madwifi-ng-refcount-r2313-20070505.old/tools/80211debug.c  2006-12-08 18:20:08.000000000 +0100
++++ madwifi-ng-refcount-r2313-20070505.dev/tools/80211debug.c  2007-05-13 18:17:55.115190256 +0200

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


@@ -32,10 +32,10 @@ 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 @@
+diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/80211stats.c madwifi-ng-refcount-r2313-20070505.dev/tools/80211stats.c
+--- madwifi-ng-refcount-r2313-20070505.old/tools/80211stats.c  2007-02-07 22:06:25.000000000 +0100
++++ madwifi-ng-refcount-r2313-20070505.dev/tools/80211stats.c  2007-05-13 18:17:55.116190104 +0200
+@@ -60,6 +60,10 @@

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


@@ -46,7 +46,7 @@ diff -urN madwifi-0.9.2.old/tools/80211stats.c madwifi-0.9.2.dev/tools/80211stat
  #ifndef SIOCG80211STATS
  #define       SIOCG80211STATS (SIOCDEVPRIVATE + 2)
  #endif
  #ifndef SIOCG80211STATS
  #define       SIOCG80211STATS (SIOCDEVPRIVATE + 2)
  #endif

-@@ -241,9 +245,19 @@
+@@ -243,9 +247,19 @@

  #undef STAT
  }
  
  #undef STAT
  }
  


@@ -66,10 +66,10 @@ 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 @@
+diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/athchans.c madwifi-ng-refcount-r2313-20070505.dev/tools/athchans.c
+--- madwifi-ng-refcount-r2313-20070505.old/tools/athchans.c    2007-02-07 22:06:25.000000000 +0100
++++ madwifi-ng-refcount-r2313-20070505.dev/tools/athchans.c    2007-05-13 18:17:55.116190104 +0200
+@@ -59,6 +59,10 @@

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


@@ -80,7 +80,7 @@ diff -urN madwifi-0.9.2.old/tools/athchans.c madwifi-0.9.2.dev/tools/athchans.c
  static        int s = -1;
  const char *progname;
  
  static        int s = -1;
  const char *progname;
  

-@@ -134,9 +138,20 @@
+@@ -136,9 +140,20 @@

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


@@ -101,9 +101,9 @@ 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
+diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/athctrl.c madwifi-ng-refcount-r2313-20070505.dev/tools/athctrl.c
+--- madwifi-ng-refcount-r2313-20070505.old/tools/athctrl.c     2006-02-03 13:03:03.000000000 +0100
++++ madwifi-ng-refcount-r2313-20070505.dev/tools/athctrl.c     2007-05-13 18:17:55.117189952 +0200

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


@@ -135,9 +135,9 @@ 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
+diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/athdebug.c madwifi-ng-refcount-r2313-20070505.dev/tools/athdebug.c
+--- madwifi-ng-refcount-r2313-20070505.old/tools/athdebug.c    2006-12-08 18:20:08.000000000 +0100
++++ madwifi-ng-refcount-r2313-20070505.dev/tools/athdebug.c    2007-05-13 18:17:55.117189952 +0200

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


@@ -170,10 +170,10 @@ 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 @@
+diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/athkey.c madwifi-ng-refcount-r2313-20070505.dev/tools/athkey.c
+--- madwifi-ng-refcount-r2313-20070505.old/tools/athkey.c      2007-02-07 22:06:25.000000000 +0100
++++ madwifi-ng-refcount-r2313-20070505.dev/tools/athkey.c      2007-05-13 18:17:55.117189952 +0200
+@@ -59,6 +59,10 @@

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


@@ -184,7 +184,7 @@ diff -urN madwifi-0.9.2.old/tools/athkey.c madwifi-0.9.2.dev/tools/athkey.c
  static int s = -1;
  const char *progname;
  
  static int s = -1;
  const char *progname;
  

-@@ -207,9 +211,19 @@
+@@ -209,9 +213,19 @@

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


@@ -204,11 +204,11 @@ 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"
+diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/athstats.c madwifi-ng-refcount-r2313-20070505.dev/tools/athstats.c
+--- madwifi-ng-refcount-r2313-20070505.old/tools/athstats.c    2007-04-04 23:25:20.000000000 +0200
++++ madwifi-ng-refcount-r2313-20070505.dev/tools/athstats.c    2007-05-13 18:17:55.118189800 +0200
+@@ -63,6 +63,10 @@
+ #include "wireless_copy.h"

  #include "if_athioctl.h"
  
 +#ifdef DOMULTI
  #include "if_athioctl.h"
  
 +#ifdef DOMULTI


@@ -218,7 +218,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,9 +239,9 @@ 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
+diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/do_multi.c madwifi-ng-refcount-r2313-20070505.dev/tools/do_multi.c
+--- madwifi-ng-refcount-r2313-20070505.old/tools/do_multi.c    1970-01-01 01:00:00.000000000 +0100
++++ madwifi-ng-refcount-r2313-20070505.dev/tools/do_multi.c    2007-05-13 18:17:55.118189800 +0200

 @@ -0,0 +1,30 @@
 +#include <string.h>
 +#include "do_multi.h"
 @@ -0,0 +1,30 @@
 +#include <string.h>
 +#include "do_multi.h"


@@ -273,9 +273,9 @@ diff -urN madwifi-0.9.2.old/tools/do_multi.c madwifi-0.9.2.dev/tools/do_multi.c
 +    
 +    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
+diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/do_multi.h madwifi-ng-refcount-r2313-20070505.dev/tools/do_multi.h
+--- madwifi-ng-refcount-r2313-20070505.old/tools/do_multi.h    1970-01-01 01:00:00.000000000 +0100
++++ madwifi-ng-refcount-r2313-20070505.dev/tools/do_multi.h    2007-05-13 18:17:55.118189800 +0200

 @@ -0,0 +1,9 @@
 +
 +int a80211debug_init(int argc, char *argv[]);
 @@ -0,0 +1,9 @@
 +
 +int a80211debug_init(int argc, char *argv[]);


@@ -286,9 +286,9 @@ 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
+diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/Makefile madwifi-ng-refcount-r2313-20070505.dev/tools/Makefile
+--- madwifi-ng-refcount-r2313-20070505.old/tools/Makefile      2007-04-04 23:25:20.000000000 +0200
++++ madwifi-ng-refcount-r2313-20070505.dev/tools/Makefile      2007-05-13 18:17:55.119189648 +0200

 @@ -49,6 +49,12 @@
  
  ALL=  athstats 80211stats athkey athchans athctrl \
 @@ -49,6 +49,12 @@
  
  ALL=  athstats 80211stats athkey athchans athctrl \


@@ -331,12 +331,12 @@ diff -urN madwifi-0.9.2.old/tools/Makefile madwifi-0.9.2.dev/tools/Makefile
 +      done
 +
  athstats: athstats.c
 +      done
 +
  athstats: athstats.c

-       $(CC) -o athstats $(ALL_CFLAGS) -I../ath $(LDFLAGS) athstats.c
+       $(CC) -o athstats $(ALL_CFLAGS) -I$(TOP)/ath $(LDFLAGS) athstats.c

  80211stats: 80211stats.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 @@
+diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/wlanconfig.c madwifi-ng-refcount-r2313-20070505.dev/tools/wlanconfig.c
+--- madwifi-ng-refcount-r2313-20070505.old/tools/wlanconfig.c  2007-05-04 02:10:06.000000000 +0200
++++ madwifi-ng-refcount-r2313-20070505.dev/tools/wlanconfig.c  2007-05-13 18:17:55.119189648 +0200
+@@ -62,6 +62,10 @@

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