Changeset 7309


Ignore:
Timestamp:
2007-05-23T16:54:18+02:00 (9 years ago)
Author:
nbd
Message:

update madwifi to latest trunk (refcount and hal-0.9.30.13 got merged) and include a security fix that was merged in 0.9.3.1

Location:
trunk/package/madwifi
Files:
1 added
1 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/madwifi/Makefile

    r7300 r7309  
    1111 
    1212PKG_NAME:=madwifi 
    13 PKG_VERSION:=r2351-20070519 
    14 PKG_BRANCH:=madwifi-hal-0.9.30.13 
     13PKG_VERSION:=r2362-20070522 
     14PKG_BRANCH:=madwifi-ng 
    1515PKG_RELEASE:=1 
    1616 
    1717PKG_SOURCE:=$(PKG_BRANCH)-$(PKG_VERSION).tar.gz 
    1818PKG_SOURCE_URL:=http://snapshots.madwifi.org/$(PKG_BRANCH) 
    19 PKG_MD5SUM:=215b6c66eb1a3c4bcd947f358ade823f 
     19PKG_MD5SUM:=7a7783ecf6596089afc4aeebdffb397b 
    2020PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_BRANCH)-$(PKG_VERSION) 
    2121 
  • trunk/package/madwifi/patches/200-no_debug.patch

    r7300 r7309  
    1 diff -urN madwifi-ng-refcount-r2313-20070505.old/ath/if_ath.c madwifi-ng-refcount-r2313-20070505.dev/ath/if_ath.c 
    2 --- madwifi-ng-refcount-r2313-20070505.old/ath/if_ath.c 2007-05-13 18:17:56.449987336 +0200 
    3 +++ madwifi-ng-refcount-r2313-20070505.dev/ath/if_ath.c 2007-05-13 18:17:56.457986120 +0200 
     1diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c 
     2--- madwifi.old/ath/if_ath.c    2007-05-23 16:46:50.748935304 +0200 
     3+++ madwifi.dev/ath/if_ath.c    2007-05-23 16:47:03.275031048 +0200 
    44@@ -75,7 +75,7 @@ 
    55 #include <net80211/if_llc.h> 
     
    1111 #include "net80211/if_athproto.h" 
    1212 #include "if_athvar.h" 
    13 @@ -359,7 +359,7 @@ 
     13@@ -356,7 +356,7 @@ 
    1414                ath_keyprint(sc, __func__, ix, hk, mac);        \ 
    1515 } while (0) 
     
    2020 #define        KEYPRINTF(sc, k, ix, mac) 
    2121 #endif /* defined(AR_DEBUG) */ 
    22 diff -urN madwifi-ng-refcount-r2313-20070505.old/ath_rate/amrr/amrr.c madwifi-ng-refcount-r2313-20070505.dev/ath_rate/amrr/amrr.c 
    23 --- madwifi-ng-refcount-r2313-20070505.old/ath_rate/amrr/amrr.c 2007-04-09 23:08:06.000000000 +0200 
    24 +++ madwifi-ng-refcount-r2313-20070505.dev/ath_rate/amrr/amrr.c 2007-05-13 18:17:56.457986120 +0200 
     22diff -ur madwifi.old/ath_rate/amrr/amrr.c madwifi.dev/ath_rate/amrr/amrr.c 
     23--- madwifi.old/ath_rate/amrr/amrr.c    2007-05-21 19:33:26.000000000 +0200 
     24+++ madwifi.dev/ath_rate/amrr/amrr.c    2007-05-23 16:47:03.276030896 +0200 
    2525@@ -69,7 +69,7 @@ 
    2626  
     
    3232 #define        DPRINTF(sc, _fmt, ...) do {                                     \ 
    3333        if (sc->sc_debug & 0x10)                                        \ 
    34 diff -urN madwifi-ng-refcount-r2313-20070505.old/ath_rate/minstrel/minstrel.c madwifi-ng-refcount-r2313-20070505.dev/ath_rate/minstrel/minstrel.c 
    35 --- madwifi-ng-refcount-r2313-20070505.old/ath_rate/minstrel/minstrel.c 2007-05-13 18:17:55.605115776 +0200 
    36 +++ madwifi-ng-refcount-r2313-20070505.dev/ath_rate/minstrel/minstrel.c 2007-05-13 18:17:56.458985968 +0200 
     34diff -ur madwifi.old/ath_rate/minstrel/minstrel.c madwifi.dev/ath_rate/minstrel/minstrel.c 
     35--- madwifi.old/ath_rate/minstrel/minstrel.c    2007-05-23 16:46:50.731937888 +0200 
     36+++ madwifi.dev/ath_rate/minstrel/minstrel.c    2007-05-23 16:47:03.276030896 +0200 
    3737@@ -116,7 +116,7 @@ 
    3838  
     
    4444 enum { 
    4545        ATH_DEBUG_RATE          = 0x00000010    /* rate control */ 
    46 diff -urN madwifi-ng-refcount-r2313-20070505.old/ath_rate/onoe/onoe.c madwifi-ng-refcount-r2313-20070505.dev/ath_rate/onoe/onoe.c 
    47 --- madwifi-ng-refcount-r2313-20070505.old/ath_rate/onoe/onoe.c 2007-04-09 23:08:06.000000000 +0200 
    48 +++ madwifi-ng-refcount-r2313-20070505.dev/ath_rate/onoe/onoe.c 2007-05-13 18:17:56.458985968 +0200 
     46diff -ur madwifi.old/ath_rate/onoe/onoe.c madwifi.dev/ath_rate/onoe/onoe.c 
     47--- madwifi.old/ath_rate/onoe/onoe.c    2007-05-21 19:33:26.000000000 +0200 
     48+++ madwifi.dev/ath_rate/onoe/onoe.c    2007-05-23 16:47:03.312025424 +0200 
    4949@@ -65,7 +65,7 @@ 
    5050  
     
    5656 enum { 
    5757        ATH_DEBUG_RATE  = 0x00000010,   /* rate control */ 
    58 diff -urN madwifi-ng-refcount-r2313-20070505.old/ath_rate/sample/sample.c madwifi-ng-refcount-r2313-20070505.dev/ath_rate/sample/sample.c 
    59 --- madwifi-ng-refcount-r2313-20070505.old/ath_rate/sample/sample.c     2007-04-09 23:08:06.000000000 +0200 
    60 +++ madwifi-ng-refcount-r2313-20070505.dev/ath_rate/sample/sample.c     2007-05-13 18:17:56.459985816 +0200 
     58diff -ur madwifi.old/ath_rate/sample/sample.c madwifi.dev/ath_rate/sample/sample.c 
     59--- madwifi.old/ath_rate/sample/sample.c        2007-05-21 19:33:26.000000000 +0200 
     60+++ madwifi.dev/ath_rate/sample/sample.c        2007-05-23 16:47:03.346020256 +0200 
    6161@@ -67,7 +67,7 @@ 
    6262  
     
    6767 #ifdef SAMPLE_DEBUG 
    6868 enum { 
    69         ATH_DEBUG_RATE          = 0x00000010    /* rate control */ 
    70 diff -urN madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_proto.c madwifi-ng-refcount-r2313-20070505.dev/net80211/ieee80211_proto.c 
    71 --- madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_proto.c   2007-02-01 21:49:37.000000000 +0100 
    72 +++ madwifi-ng-refcount-r2313-20070505.dev/net80211/ieee80211_proto.c   2007-05-13 18:17:56.460985664 +0200 
     69        ATH_DEBUG_NODE          = 0x00080000,   /* node management */ 
     70diff -ur madwifi.old/net80211/ieee80211_proto.c madwifi.dev/net80211/ieee80211_proto.c 
     71--- madwifi.old/net80211/ieee80211_proto.c      2007-05-21 17:53:39.000000000 +0200 
     72+++ madwifi.dev/net80211/ieee80211_proto.c      2007-05-23 16:47:03.347020104 +0200 
    7373@@ -312,6 +312,7 @@ 
    7474 } 
     
    8787 int 
    8888 ieee80211_fix_rate(struct ieee80211_node *ni, int flags) 
    89 diff -urN madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_proto.h madwifi-ng-refcount-r2313-20070505.dev/net80211/ieee80211_proto.h 
    90 --- madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_proto.h   2007-01-30 05:01:29.000000000 +0100 
    91 +++ madwifi-ng-refcount-r2313-20070505.dev/net80211/ieee80211_proto.h   2007-05-13 18:17:56.460985664 +0200 
     89diff -ur madwifi.old/net80211/ieee80211_proto.h madwifi.dev/net80211/ieee80211_proto.h 
     90--- madwifi.old/net80211/ieee80211_proto.h      2007-01-30 05:01:29.000000000 +0100 
     91+++ madwifi.dev/net80211/ieee80211_proto.h      2007-05-23 16:47:03.347020104 +0200 
    9292@@ -247,7 +247,11 @@ 
    9393 #endif 
     
    102102  
    103103 /* 
    104 diff -urN madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_var.h madwifi-ng-refcount-r2313-20070505.dev/net80211/ieee80211_var.h 
    105 --- madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_var.h     2007-05-13 18:17:56.107039472 +0200 
    106 +++ madwifi-ng-refcount-r2313-20070505.dev/net80211/ieee80211_var.h     2007-05-13 18:17:56.461985512 +0200 
    107 @@ -37,7 +37,7 @@ 
    108  /* 
    109   * Definitions for IEEE 802.11 drivers. 
    110   */ 
     104diff -ur madwifi.old/net80211/ieee80211_var.h madwifi.dev/net80211/ieee80211_var.h 
     105--- madwifi.old/net80211/ieee80211_var.h        2007-05-21 19:33:26.000000000 +0200 
     106+++ madwifi.dev/net80211/ieee80211_var.h        2007-05-23 16:47:19.427575488 +0200 
     107@@ -35,8 +35,8 @@ 
     108 #ifndef _NET80211_IEEE80211_VAR_H_ 
     109 #define _NET80211_IEEE80211_VAR_H_ 
     110  
    111111-#define        IEEE80211_DEBUG 
     112-#define        IEEE80211_DEBUG_REFCNT                  /* Node reference count debugging */ 
    112113+#undef IEEE80211_DEBUG 
    113  #undef IEEE80211_DEBUG_REFCNT                  /* node refcnt stuff */ 
     114+#undef IEEE80211_DEBUG_REFCNT                  /* Node reference count debugging */ 
    114115  
     116 /* Definitions for IEEE 802.11 drivers. */ 
    115117 #include <net80211/ieee80211_linux.h> 
    116 diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/do_multi.c madwifi-ng-refcount-r2313-20070505.dev/tools/do_multi.c 
    117 --- madwifi-ng-refcount-r2313-20070505.old/tools/do_multi.c     2007-05-13 18:17:55.192178552 +0200 
    118 +++ madwifi-ng-refcount-r2313-20070505.dev/tools/do_multi.c     2007-05-13 18:17:56.461985512 +0200 
     118diff -ur madwifi.old/tools/do_multi.c madwifi.dev/tools/do_multi.c 
     119--- madwifi.old/tools/do_multi.c        2007-05-23 16:46:50.718939864 +0200 
     120+++ madwifi.dev/tools/do_multi.c        2007-05-23 16:47:03.349019800 +0200 
    119121@@ -9,16 +9,20 @@ 
    120122  
     
    138140        ret =  athkey_init(argc, argv); 
    139141     if(strcmp(progname, "athstats") == 0) 
    140 diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/Makefile madwifi-ng-refcount-r2313-20070505.dev/tools/Makefile 
    141 --- madwifi-ng-refcount-r2313-20070505.old/tools/Makefile       2007-05-13 18:17:55.192178552 +0200 
    142 +++ madwifi-ng-refcount-r2313-20070505.dev/tools/Makefile       2007-05-13 18:17:56.461985512 +0200 
     142diff -ur madwifi.old/tools/Makefile madwifi.dev/tools/Makefile 
     143--- madwifi.old/tools/Makefile  2007-05-23 16:46:50.719939712 +0200 
     144+++ madwifi.dev/tools/Makefile  2007-05-23 16:47:03.349019800 +0200 
    143145@@ -52,7 +52,7 @@ 
    144146         
Note: See TracChangeset for help on using the changeset viewer.