Changeset 7211


Ignore:
Timestamp:
2007-05-13T18:24:11+02:00 (10 years ago)
Author:
nbd
Message:

huge madwifi update - use a madwifi-ng-refcount snapshot as base, includes lots of bugfixes and performance enhancements

Location:
trunk/package/madwifi
Files:
16 added
7 deleted
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/madwifi/Makefile

    r6582 r7211  
    1111 
    1212PKG_NAME:=madwifi 
    13 PKG_VERSION:=0.9.2.1 
     13PKG_VERSION:=r2313-20070505 
    1414PKG_RELEASE:=1 
    1515 
    16 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
    17 PKG_SOURCE_URL:=@SF/$(PKG_NAME) 
    18 PKG_MD5SUM:=bf5509fccd3852e22551826063b1b61e 
     16PKG_SOURCE:=madwifi-ng-refcount-$(PKG_VERSION).tar.gz 
     17PKG_SOURCE_URL:=http://snapshots.madwifi.org/madwifi-ng-refcount 
     18PKG_MD5SUM:=01ee9dfb1f174be6e009f9697f7267b8 
     19PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/madwifi-ng-refcount-r2313-20070505 
    1920 
    2021include $(INCLUDE_DIR)/package.mk 
    2122 
    22 RATE_CONTROL:=sample 
     23RATE_CONTROL:=minstrel 
    2324 
    2425ifeq ($(ARCH),mips) 
     
    8687  VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE) 
    8788  FILES:= \ 
    88                 $(PKG_BUILD_DIR)/ath/ath_hal.$(LINUX_KMOD_SUFFIX) \ 
     89                $(PKG_BUILD_DIR)/ath_hal/ath_hal.$(LINUX_KMOD_SUFFIX) \ 
    8990                $(BUS_MODULES) \ 
    9091                $(PKG_BUILD_DIR)/ath_rate/$(RATE_CONTROL)/ath_rate_$(RATE_CONTROL).$(LINUX_KMOD_SUFFIX) \ 
     
    103104                LDOPTS="--no-warn-mismatch " \ 
    104105                ATH_RATE="ath_rate/$(RATE_CONTROL)" \ 
    105                 DOMULTI=1 
     106                WARNINGS="" \ 
     107                DOMULTI=1 \ 
     108                V=1 
    106109 
    107110ifeq ($(findstring AHB,$(BUS)),AHB) 
    108111  define Build/Compile/ahb 
    109         $(MAKE) $(MADWIFI_MAKEOPTS) BUS="AHB" modules 
     112        COPTS="-DCONFIG_ATHEROS_RATE_DEFAULT='\"$(RATE_CONTROL)\"'" $(MAKE) $(MADWIFI_MAKEOPTS) BUS="AHB" modules 
    110113  endef 
    111114endif 
     
    113116ifeq ($(findstring PCI,$(BUS)),PCI) 
    114117  define Build/Compile/pci 
    115         $(MAKE) $(MADWIFI_MAKEOPTS) BUS="PCI" modules 
     118        COPTS="-DCONFIG_ATHEROS_RATE_DEFAULT='\"$(RATE_CONTROL)\"'" $(MAKE) $(MADWIFI_MAKEOPTS) BUS="PCI" modules 
    116119  endef 
    117120endif 
  • trunk/package/madwifi/patches/100-kernel_cflags.patch

    r6557 r7211  
    1 diff -Nur madwifi-0.9.2.1/hal/public/mips-be-elf.inc madwifi-0.9.2.1-owrt/hal/public/mips-be-elf.inc 
    2 --- madwifi-0.9.2.1/hal/public/mips-be-elf.inc  2006-05-27 04:48:16.000000000 +0200 
    3 +++ madwifi-0.9.2.1-owrt/hal/public/mips-be-elf.inc     2007-03-11 19:50:19.000000000 +0100 
     1diff -urN madwifi-ng-refcount-r2313-20070505.old/hal/public/mips-be-elf.inc madwifi-ng-refcount-r2313-20070505.dev/hal/public/mips-be-elf.inc 
     2--- madwifi-ng-refcount-r2313-20070505.old/hal/public/mips-be-elf.inc   2006-05-27 04:48:16.000000000 +0200 
     3+++ madwifi-ng-refcount-r2313-20070505.dev/hal/public/mips-be-elf.inc   2007-05-13 18:17:54.962213512 +0200 
    44@@ -71,5 +71,5 @@ 
    55  
     
    99+COPTS+=        -G 0 -mno-abicalls -fno-pic -mips32 -Wa,--trap \ 
    1010        -fno-strict-aliasing -fno-common -fomit-frame-pointer -mlong-calls 
    11 diff -Nur madwifi-0.9.2.1/hal/public/mips-le-elf.inc madwifi-0.9.2.1-owrt/hal/public/mips-le-elf.inc 
    12 --- madwifi-0.9.2.1/hal/public/mips-le-elf.inc  2006-05-27 04:48:16.000000000 +0200 
    13 +++ madwifi-0.9.2.1-owrt/hal/public/mips-le-elf.inc     2007-03-11 19:50:19.000000000 +0100 
     11diff -urN madwifi-ng-refcount-r2313-20070505.old/hal/public/mips-le-elf.inc madwifi-ng-refcount-r2313-20070505.dev/hal/public/mips-le-elf.inc 
     12--- madwifi-ng-refcount-r2313-20070505.old/hal/public/mips-le-elf.inc   2006-05-27 04:48:16.000000000 +0200 
     13+++ madwifi-ng-refcount-r2313-20070505.dev/hal/public/mips-le-elf.inc   2007-05-13 18:17:54.963213360 +0200 
    1414@@ -68,5 +68,5 @@ 
    1515  
     
    1919+COPTS+=        -G 0 -mno-abicalls -fno-pic -mips32 -Wa,--trap \ 
    2020        -fno-strict-aliasing -fno-common -fomit-frame-pointer -mlong-calls 
    21 diff -Nur madwifi-0.9.2.1/hal/public/xscale-be-elf.inc madwifi-0.9.2.1-owrt/hal/public/xscale-be-elf.inc 
    22 --- madwifi-0.9.2.1/hal/public/xscale-be-elf.inc        2006-05-27 04:48:16.000000000 +0200 
    23 +++ madwifi-0.9.2.1-owrt/hal/public/xscale-be-elf.inc   2007-03-11 19:50:19.000000000 +0100 
    24 @@ -77,5 +77,5 @@ 
    25   
    26  LDOPTS=        -EB 
    27  COPTS+=        -DAH_BYTE_ORDER=AH_BIG_ENDIAN 
    28 -COPTS+= -march=armv4 -mbig-endian -fno-strict-aliasing -fno-common -mapcs-32 \ 
    29 +COPTS+= -march=armv5te -mtune=xscale -mbig-endian -fno-strict-aliasing -fno-common \ 
    30         -mtune=xscale  -mshort-load-bytes -msoft-float -mfp=2 
    31 diff -Nur madwifi-0.9.2.1/hal/public/xscale-le-elf.inc madwifi-0.9.2.1-owrt/hal/public/xscale-le-elf.inc 
    32 --- madwifi-0.9.2.1/hal/public/xscale-le-elf.inc        2006-05-27 04:48:16.000000000 +0200 
    33 +++ madwifi-0.9.2.1-owrt/hal/public/xscale-le-elf.inc   2007-03-11 19:53:53.000000000 +0100 
    34 @@ -78,5 +78,5 @@ 
    35   
    36  LDOPTS=        -EL 
    37  COPTS+=        -DAH_BYTE_ORDER=AH_LITTLE_ENDIAN 
    38 -COPTS+= -march=armv4 -mlittle-endian -fno-strict-aliasing -fno-common \ 
    39 -       -mapcs-32 -mtune=xscale  -mshort-load-bytes -msoft-float -mfp=2 
    40 +COPTS+= -march=armv5te -mtune=xscale -mlittle-endian -fno-strict-aliasing -fno-common \ 
    41 +       -mshort-load-bytes 
    42 diff -Nur madwifi-0.9.2.1/Makefile madwifi-0.9.2.1-owrt/Makefile 
    43 --- madwifi-0.9.2.1/Makefile    2006-07-14 07:15:56.000000000 +0200 
    44 +++ madwifi-0.9.2.1-owrt/Makefile       2007-03-11 19:50:19.000000000 +0100 
    45 @@ -54,7 +54,7 @@ 
     21diff -urN madwifi-ng-refcount-r2313-20070505.old/Makefile madwifi-ng-refcount-r2313-20070505.dev/Makefile 
     22--- madwifi-ng-refcount-r2313-20070505.old/Makefile     2007-03-08 20:59:06.000000000 +0100 
     23+++ madwifi-ng-refcount-r2313-20070505.dev/Makefile     2007-05-13 18:17:54.963213360 +0200 
     24@@ -56,7 +56,7 @@ 
    4625  
    4726 all: modules tools 
  • trunk/package/madwifi/patches/102-multicall_binary.patch

    r6501 r7211  
    1 diff -urN madwifi-0.9.2.old/tools/80211debug.c madwifi-0.9.2.dev/tools/80211debug.c 
    2 --- madwifi-0.9.2.old/tools/80211debug.c        2006-03-10 14:23:50.000000000 +0100 
    3 +++ madwifi-0.9.2.dev/tools/80211debug.c        2006-08-29 17:49:50.000000000 +0200 
     1diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/80211debug.c madwifi-ng-refcount-r2313-20070505.dev/tools/80211debug.c 
     2--- madwifi-ng-refcount-r2313-20070505.old/tools/80211debug.c   2006-12-08 18:20:08.000000000 +0100 
     3+++ madwifi-ng-refcount-r2313-20070505.dev/tools/80211debug.c   2007-05-13 18:17:55.115190256 +0200 
    44@@ -49,6 +49,10 @@ 
    55 #include <getopt.h> 
     
    3333        const char *cp, *tp; 
    3434        const char *sep; 
    35 diff -urN madwifi-0.9.2.old/tools/80211stats.c madwifi-0.9.2.dev/tools/80211stats.c 
    36 --- madwifi-0.9.2.old/tools/80211stats.c        2006-05-27 08:21:18.000000000 +0200 
    37 +++ madwifi-0.9.2.dev/tools/80211stats.c        2006-08-29 17:49:50.000000000 +0200 
    38 @@ -58,6 +58,10 @@ 
     35diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/80211stats.c madwifi-ng-refcount-r2313-20070505.dev/tools/80211stats.c 
     36--- madwifi-ng-refcount-r2313-20070505.old/tools/80211stats.c   2007-02-07 22:06:25.000000000 +0100 
     37+++ madwifi-ng-refcount-r2313-20070505.dev/tools/80211stats.c   2007-05-13 18:17:55.116190104 +0200 
     38@@ -60,6 +60,10 @@ 
    3939 #include "net80211/ieee80211_crypto.h" 
    4040 #include "net80211/ieee80211_ioctl.h" 
     
    4747 #define        SIOCG80211STATS (SIOCDEVPRIVATE + 2) 
    4848 #endif 
    49 @@ -241,9 +245,19 @@ 
     49@@ -243,9 +247,19 @@ 
    5050 #undef STAT 
    5151 } 
     
    6767        struct ieee80211req_sta_info *si; 
    6868        u_int8_t buf[24*1024], *cp; 
    69 diff -urN madwifi-0.9.2.old/tools/athchans.c madwifi-0.9.2.dev/tools/athchans.c 
    70 --- madwifi-0.9.2.old/tools/athchans.c  2006-02-01 21:07:11.000000000 +0100 
    71 +++ madwifi-0.9.2.dev/tools/athchans.c  2006-08-29 17:49:50.000000000 +0200 
    72 @@ -57,6 +57,10 @@ 
     69diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/athchans.c madwifi-ng-refcount-r2313-20070505.dev/tools/athchans.c 
     70--- madwifi-ng-refcount-r2313-20070505.old/tools/athchans.c     2007-02-07 22:06:25.000000000 +0100 
     71+++ madwifi-ng-refcount-r2313-20070505.dev/tools/athchans.c     2007-05-13 18:17:55.116190104 +0200 
     72@@ -59,6 +59,10 @@ 
    7373 #include "net80211/ieee80211_crypto.h" 
    7474 #include "net80211/ieee80211_ioctl.h" 
     
    8181 const char *progname; 
    8282  
    83 @@ -134,9 +138,20 @@ 
     83@@ -136,9 +140,20 @@ 
    8484 } 
    8585  
     
    102102        struct ieee80211req_chanlist chanlist; 
    103103        int c; 
    104 diff -urN madwifi-0.9.2.old/tools/athctrl.c madwifi-0.9.2.dev/tools/athctrl.c 
    105 --- madwifi-0.9.2.old/tools/athctrl.c   2006-02-03 13:03:03.000000000 +0100 
    106 +++ madwifi-0.9.2.dev/tools/athctrl.c   2006-08-29 17:49:50.000000000 +0200 
     104diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/athctrl.c madwifi-ng-refcount-r2313-20070505.dev/tools/athctrl.c 
     105--- madwifi-ng-refcount-r2313-20070505.old/tools/athctrl.c      2006-02-03 13:03:03.000000000 +0100 
     106+++ madwifi-ng-refcount-r2313-20070505.dev/tools/athctrl.c      2007-05-13 18:17:55.117189952 +0200 
    107107@@ -53,6 +53,10 @@ 
    108108  
     
    136136        int distance = -1; 
    137137        int c; 
    138 diff -urN madwifi-0.9.2.old/tools/athdebug.c madwifi-0.9.2.dev/tools/athdebug.c 
    139 --- madwifi-0.9.2.old/tools/athdebug.c  2006-05-05 06:17:59.000000000 +0200 
    140 +++ madwifi-0.9.2.dev/tools/athdebug.c  2006-08-29 17:49:50.000000000 +0200 
     138diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/athdebug.c madwifi-ng-refcount-r2313-20070505.dev/tools/athdebug.c 
     139--- madwifi-ng-refcount-r2313-20070505.old/tools/athdebug.c     2006-12-08 18:20:08.000000000 +0100 
     140+++ madwifi-ng-refcount-r2313-20070505.dev/tools/athdebug.c     2007-05-13 18:17:55.117189952 +0200 
    141141@@ -52,6 +52,10 @@ 
    142142 #include <getopt.h> 
     
    171171        const char *ifname = "wifi0"; 
    172172 #else 
    173 diff -urN madwifi-0.9.2.old/tools/athkey.c madwifi-0.9.2.dev/tools/athkey.c 
    174 --- madwifi-0.9.2.old/tools/athkey.c    2006-02-01 21:07:11.000000000 +0100 
    175 +++ madwifi-0.9.2.dev/tools/athkey.c    2006-08-29 17:49:50.000000000 +0200 
    176 @@ -57,6 +57,10 @@ 
     173diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/athkey.c madwifi-ng-refcount-r2313-20070505.dev/tools/athkey.c 
     174--- madwifi-ng-refcount-r2313-20070505.old/tools/athkey.c       2007-02-07 22:06:25.000000000 +0100 
     175+++ madwifi-ng-refcount-r2313-20070505.dev/tools/athkey.c       2007-05-13 18:17:55.117189952 +0200 
     176@@ -59,6 +59,10 @@ 
    177177 #include "net80211/ieee80211_crypto.h" 
    178178 #include "net80211/ieee80211_ioctl.h" 
     
    185185 const char *progname; 
    186186  
    187 @@ -207,9 +211,19 @@ 
     187@@ -209,9 +213,19 @@ 
    188188        exit(-1); 
    189189 } 
     
    205205        struct ieee80211req_key setkey; 
    206206        struct ieee80211req_del_key delkey; 
    207 diff -urN madwifi-0.9.2.old/tools/athstats.c madwifi-0.9.2.dev/tools/athstats.c 
    208 --- madwifi-0.9.2.old/tools/athstats.c  2006-05-05 06:20:50.000000000 +0200 
    209 +++ madwifi-0.9.2.dev/tools/athstats.c  2006-08-29 17:49:50.000000000 +0200 
    210 @@ -64,6 +64,10 @@ 
    211  #include "ah_desc.h" 
     207diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/athstats.c madwifi-ng-refcount-r2313-20070505.dev/tools/athstats.c 
     208--- madwifi-ng-refcount-r2313-20070505.old/tools/athstats.c     2007-04-04 23:25:20.000000000 +0200 
     209+++ madwifi-ng-refcount-r2313-20070505.dev/tools/athstats.c     2007-05-13 18:17:55.118189800 +0200 
     210@@ -63,6 +63,10 @@ 
     211 #include "wireless_copy.h" 
    212212 #include "if_athioctl.h" 
    213213  
     
    219219        u_int           phyerr; 
    220220        const char*     desc; 
    221 @@ -227,9 +231,20 @@ 
     221@@ -226,9 +230,20 @@ 
    222222        signalled = 1; 
    223223 } 
     
    240240        const char *ifname = "wifi0"; 
    241241 #else 
    242 diff -urN madwifi-0.9.2.old/tools/do_multi.c madwifi-0.9.2.dev/tools/do_multi.c 
    243 --- madwifi-0.9.2.old/tools/do_multi.c  1970-01-01 01:00:00.000000000 +0100 
    244 +++ madwifi-0.9.2.dev/tools/do_multi.c  2006-08-29 17:49:50.000000000 +0200 
     242diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/do_multi.c madwifi-ng-refcount-r2313-20070505.dev/tools/do_multi.c 
     243--- madwifi-ng-refcount-r2313-20070505.old/tools/do_multi.c     1970-01-01 01:00:00.000000000 +0100 
     244+++ madwifi-ng-refcount-r2313-20070505.dev/tools/do_multi.c     2007-05-13 18:17:55.118189800 +0200 
    245245@@ -0,0 +1,30 @@ 
    246246+#include <string.h> 
     
    274274+    return ret; 
    275275+} 
    276 diff -urN madwifi-0.9.2.old/tools/do_multi.h madwifi-0.9.2.dev/tools/do_multi.h 
    277 --- madwifi-0.9.2.old/tools/do_multi.h  1970-01-01 01:00:00.000000000 +0100 
    278 +++ madwifi-0.9.2.dev/tools/do_multi.h  2006-08-29 17:49:50.000000000 +0200 
     276diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/do_multi.h madwifi-ng-refcount-r2313-20070505.dev/tools/do_multi.h 
     277--- madwifi-ng-refcount-r2313-20070505.old/tools/do_multi.h     1970-01-01 01:00:00.000000000 +0100 
     278+++ madwifi-ng-refcount-r2313-20070505.dev/tools/do_multi.h     2007-05-13 18:17:55.118189800 +0200 
    279279@@ -0,0 +1,9 @@ 
    280280+ 
     
    287287+int athstats_init(int argc, char *argv[]); 
    288288+int wlanconfig_init(int argc, char *argv[]); 
    289 diff -urN madwifi-0.9.2.old/tools/Makefile madwifi-0.9.2.dev/tools/Makefile 
    290 --- madwifi-0.9.2.old/tools/Makefile    2006-07-14 07:15:56.000000000 +0200 
    291 +++ madwifi-0.9.2.dev/tools/Makefile    2006-08-29 17:49:50.000000000 +0200 
     289diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/Makefile madwifi-ng-refcount-r2313-20070505.dev/tools/Makefile 
     290--- madwifi-ng-refcount-r2313-20070505.old/tools/Makefile       2007-04-04 23:25:20.000000000 +0200 
     291+++ madwifi-ng-refcount-r2313-20070505.dev/tools/Makefile       2007-05-13 18:17:55.119189648 +0200 
    292292@@ -49,6 +49,12 @@ 
    293293  
     
    332332+ 
    333333 athstats: athstats.c 
    334         $(CC) -o athstats $(ALL_CFLAGS) -I../ath $(LDFLAGS) athstats.c 
     334        $(CC) -o athstats $(ALL_CFLAGS) -I$(TOP)/ath $(LDFLAGS) athstats.c 
    335335 80211stats: 80211stats.c 
    336 diff -urN madwifi-0.9.2.old/tools/wlanconfig.c madwifi-0.9.2.dev/tools/wlanconfig.c 
    337 --- madwifi-0.9.2.old/tools/wlanconfig.c        2006-05-14 09:17:29.000000000 +0200 
    338 +++ madwifi-0.9.2.dev/tools/wlanconfig.c        2006-08-29 17:49:50.000000000 +0200 
    339 @@ -60,6 +60,10 @@ 
     336diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/wlanconfig.c madwifi-ng-refcount-r2313-20070505.dev/tools/wlanconfig.c 
     337--- madwifi-ng-refcount-r2313-20070505.old/tools/wlanconfig.c   2007-05-04 02:10:06.000000000 +0200 
     338+++ madwifi-ng-refcount-r2313-20070505.dev/tools/wlanconfig.c   2007-05-13 18:17:55.119189648 +0200 
     339@@ -62,6 +62,10 @@ 
    340340 #include "net80211/ieee80211_crypto.h" 
    341341 #include "net80211/ieee80211_ioctl.h" 
  • trunk/package/madwifi/patches/103-disable_rfkill.patch

    r6501 r7211  
    1 diff -urN madwifi-0.9.2.old/ath/if_ath.c madwifi-0.9.2.dev/ath/if_ath.c 
    2 --- madwifi-0.9.2.old/ath/if_ath.c      2006-07-08 08:47:19.000000000 +0200 
    3 +++ madwifi-0.9.2.dev/ath/if_ath.c      2006-08-29 17:49:50.000000000 +0200 
    4 @@ -251,7 +251,7 @@ 
    5  static int ath_outdoor = AH_FALSE;             /* enable outdoor use */ 
     1diff -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-04 23:09:29.000000000 +0200 
     3+++ madwifi-ng-refcount-r2313-20070505.dev/ath/if_ath.c 2007-05-13 18:17:55.201177184 +0200 
     4@@ -260,7 +260,7 @@ 
    65 static int ath_xchanmode = AH_TRUE;            /* enable extended channels */ 
    76 static char *autocreate = NULL; 
     7 static char *ratectl = DEF_RATE_CTL; 
    88-static int rfkill = -1; 
    99+static int rfkill = 0; 
  • trunk/package/madwifi/patches/104-autocreate_none.patch

    r6501 r7211  
    1 diff -urN madwifi-0.9.2.old/ath/if_ath.c madwifi-0.9.2.dev/ath/if_ath.c 
    2 --- madwifi-0.9.2.old/ath/if_ath.c      2006-08-29 17:49:50.000000000 +0200 
    3 +++ madwifi-0.9.2.dev/ath/if_ath.c      2006-08-29 17:49:50.000000000 +0200 
    4 @@ -387,7 +387,7 @@ 
    5         struct ath_hal *ah; 
     1diff -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:55.278165480 +0200 
     3+++ madwifi-ng-refcount-r2313-20070505.dev/ath/if_ath.c 2007-05-13 18:17:55.287164112 +0200 
     4@@ -401,7 +401,7 @@ 
    65        HAL_STATUS status; 
    7         int error = 0, i; 
     6        int error = 0; 
     7        unsigned int i; 
    88-       int autocreatemode = IEEE80211_M_STA; 
    99+       int autocreatemode = -1; 
  • trunk/package/madwifi/patches/110-init_fix_PR_914.patch

    r6501 r7211  
    1 Doing ifconfig athX down/ifconfig athX up several times provokes kernel crash. 
    2 See http://madwifi.org/ticket/914. But if ath_hal_phydisable() is skipped  - 
    3 I observe NO CRASH whatsoever ... :\ Weird. 
    4  
    5 Signed-off-by: Mindaugas KriaučiÅ«nas <mindaugas.kriauciunas@gmail.com> 
    6 Signed-off-by: Åœilvinas Valinskas <valins@soften.ktu.lt> 
    7  
    8 Index: madwifi-ng-trunk/ath/if_ath.c 
    9 =================================================================== 
    10 --- madwifi-ng-trunk.orig/ath/if_ath.c  2006-10-16 17:40:50.000000000 +0300 
    11 +++ madwifi-ng-trunk/ath/if_ath.c       2006-10-18 16:17:32.000000000 +0300 
    12 @@ -1997,7 +1997,10 @@ 
     1diff -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:55.362152712 +0200 
     3+++ madwifi-ng-refcount-r2313-20070505.dev/ath/if_ath.c 2007-05-13 18:17:55.614114408 +0200 
     4@@ -2003,7 +2003,10 @@ 
    135                ath_draintxq(sc); 
    146                if (!sc->sc_invalid) { 
  • trunk/package/madwifi/patches/111-wds_fix_PR_914.patch

    r6501 r7211  
    1 WDS related crash is observed. This causes by possible random memory 
    2 writes/accesss. Note how wds is freed, yet it will be used further in 
    3 loop ... 
    4  
    5 Other usages in the tree of LIST_FOREACH() when element is found and 
    6 acted up on element, loop is immediately break (either via break, or 
    7 return). But not in this case ... 
    8  
    9 Signed-off-by: Mindaugas KriaučiÅ«nas <mindaugas.kriauciunas@gmail.com> 
    10 Signed-off-by: Åœilvinas Valinskas <valins@soften.ktu.lt> 
    11  
    12 Index: madwifi-ng-trunk/net80211/ieee80211_node.c 
    13 =================================================================== 
    14 --- madwifi-ng-trunk.orig/net80211/ieee80211_node.c     2006-09-25 13:28:08.000000000 +0300 
    15 +++ madwifi-ng-trunk/net80211/ieee80211_node.c  2006-10-18 15:59:40.000000000 +0300 
    16 @@ -961,11 +961,11 @@ 
     1diff -urN madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_node.c madwifi-ng-refcount-r2313-20070505.dev/net80211/ieee80211_node.c 
     2--- madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_node.c    2007-05-04 23:09:29.000000000 +0200 
     3+++ madwifi-ng-refcount-r2313-20070505.dev/net80211/ieee80211_node.c    2007-05-13 18:17:55.697101792 +0200 
     4@@ -981,11 +981,11 @@ 
    175 ieee80211_del_wds_node(struct ieee80211_node_table *nt, struct ieee80211_node *ni) 
    186 { 
     
    219+       struct ieee80211_wds_addr *wds, *next; 
    2210  
    23         IEEE80211_NODE_LOCK_IRQ(nt); 
     11        IEEE80211_NODE_TABLE_LOCK_IRQ(nt); 
    2412        for (hash = 0; hash < IEEE80211_NODE_HASHSIZE; hash++) { 
    2513-               LIST_FOREACH(wds, &nt->nt_wds_hash[hash], wds_hash) { 
    2614+               LIST_FOREACH_SAFE(wds, &nt->nt_wds_hash[hash], wds_hash, next) { 
    2715                        if (wds->wds_ni == ni) { 
    28                                 if (ieee80211_node_dectestref(ni)) { 
    29                                         _ieee80211_free_node(ni); 
    30 @@ -984,11 +984,11 @@ 
     16                                LIST_REMOVE(wds, wds_hash); 
     17                                ieee80211_unref_node(&wds->wds_ni); 
     18@@ -1002,11 +1002,11 @@ 
    3119 { 
    3220        struct ieee80211_node_table *nt = (struct ieee80211_node_table *)data; 
     
    3523+       struct ieee80211_wds_addr *wds, *next; 
    3624  
    37         IEEE80211_NODE_LOCK_IRQ(nt); 
     25        IEEE80211_NODE_TABLE_LOCK_IRQ(nt); 
    3826        for (hash = 0; hash < IEEE80211_NODE_HASHSIZE; hash++) { 
    3927-               LIST_FOREACH(wds, &nt->nt_wds_hash[hash], wds_hash) { 
     
    4129                        if (wds->wds_agingcount != WDS_AGING_STATIC) { 
    4230                                if (!wds->wds_agingcount) { 
    43                                         if (ieee80211_node_dectestref(wds->wds_ni)) { 
     31                                        LIST_REMOVE(wds, wds_hash); 
  • trunk/package/madwifi/patches/200-no_debug.patch

    r6501 r7211  
    1 diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c 
    2 --- madwifi.old/ath/if_ath.c    2007-02-20 23:24:27.274770480 +0100 
    3 +++ madwifi.dev/ath/if_ath.c    2007-02-20 23:26:49.917085552 +0100 
    4 @@ -72,7 +72,7 @@ 
     1diff -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 
     4@@ -75,7 +75,7 @@ 
    55 #include <net80211/if_llc.h> 
    66 #endif 
     
    99+#undef AR_DEBUG 
    1010  
    11  #include "if_athrate.h" 
    1211 #include "net80211/if_athproto.h" 
    13 @@ -347,7 +347,7 @@ 
    14                 ath_keyprint(__func__, ix, hk, mac);            \ 
     12 #include "if_athvar.h" 
     13@@ -359,7 +359,7 @@ 
     14                ath_keyprint(sc, __func__, ix, hk, mac);        \ 
    1515 } while (0) 
    1616 #else /* defined(AR_DEBUG) */ 
     
    2020 #define        KEYPRINTF(sc, k, ix, mac) 
    2121 #endif /* defined(AR_DEBUG) */ 
    22 diff -ur madwifi.old/ath_rate/amrr/amrr.c madwifi.dev/ath_rate/amrr/amrr.c 
    23 --- madwifi.old/ath_rate/amrr/amrr.c    2007-02-20 23:24:27.274770480 +0100 
    24 +++ madwifi.dev/ath_rate/amrr/amrr.c    2007-02-20 23:23:54.714720360 +0100 
    25 @@ -67,7 +67,7 @@ 
     22diff -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 
     25@@ -69,7 +69,7 @@ 
    2626  
    2727 #include "amrr.h" 
     
    3232 #define        DPRINTF(sc, _fmt, ...) do {                                     \ 
    3333        if (sc->sc_debug & 0x10)                                        \ 
    34 diff -ur madwifi.old/ath_rate/onoe/onoe.c madwifi.dev/ath_rate/onoe/onoe.c 
    35 --- madwifi.old/ath_rate/onoe/onoe.c    2007-02-20 23:24:27.275770328 +0100 
    36 +++ madwifi.dev/ath_rate/onoe/onoe.c    2007-02-20 23:23:54.714720360 +0100 
    37 @@ -63,7 +63,7 @@ 
     34diff -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 
     37@@ -117,7 +117,7 @@ 
     38 #include "minstrel.h" 
     39  
     40 /* XXX: Use standard debug functions */ 
     41-#define        MINSTREL_DEBUG 10 
     42+#undef MINSTREL_DEBUG 
     43 #ifdef MINSTREL_DEBUG 
     44 enum { 
     45        ATH_DEBUG_RATE          = 0x00000010    /* rate control */ 
     46diff -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 
     49@@ -65,7 +65,7 @@ 
    3850  
    3951 #include "onoe.h" 
     
    4456 enum { 
    4557        ATH_DEBUG_RATE  = 0x00000010,   /* rate control */ 
    46 diff -ur madwifi.old/ath_rate/sample/sample.c madwifi.dev/ath_rate/sample/sample.c 
    47 --- madwifi.old/ath_rate/sample/sample.c        2007-02-20 23:24:27.275770328 +0100 
    48 +++ madwifi.dev/ath_rate/sample/sample.c        2007-02-20 23:23:54.715720208 +0100 
    49 @@ -65,7 +65,7 @@ 
     58diff -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 
     61@@ -67,7 +67,7 @@ 
    5062  
    5163 #include "sample.h" 
     
    5668 enum { 
    5769        ATH_DEBUG_RATE          = 0x00000010    /* rate control */ 
    58 diff -ur madwifi.old/net80211/ieee80211_proto.c madwifi.dev/net80211/ieee80211_proto.c 
    59 --- madwifi.old/net80211/ieee80211_proto.c      2007-02-20 23:23:54.682725000 +0100 
    60 +++ madwifi.dev/net80211/ieee80211_proto.c      2007-02-20 23:26:03.244180912 +0100 
    61 @@ -307,6 +307,7 @@ 
     70diff -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 
     73@@ -312,6 +312,7 @@ 
    6274 } 
    6375 EXPORT_SYMBOL(ieee80211_print_essid); 
     
    6779 ieee80211_dump_pkt(struct ieee80211com *ic, 
    6880        const u_int8_t *buf, int len, int rate, int rssi) 
    69 @@ -385,6 +386,7 @@ 
     81@@ -390,6 +391,7 @@ 
    7082        } 
    7183 } 
     
    7587 int 
    7688 ieee80211_fix_rate(struct ieee80211_node *ni, int flags) 
    77 diff -ur madwifi.old/net80211/ieee80211_proto.h madwifi.dev/net80211/ieee80211_proto.h 
    78 --- madwifi.old/net80211/ieee80211_proto.h      2006-06-10 04:17:05.000000000 +0200 
    79 +++ madwifi.dev/net80211/ieee80211_proto.h      2007-02-20 23:27:28.791175792 +0100 
    80 @@ -246,7 +246,11 @@ 
     89diff -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 
     92@@ -247,7 +247,11 @@ 
    8193 #endif 
    8294 int ieee80211_new_state(struct ieee80211vap *, enum ieee80211_state, int); 
     
    90102  
    91103 /* 
    92 diff -ur madwifi.old/net80211/ieee80211_var.h madwifi.dev/net80211/ieee80211_var.h 
    93 --- madwifi.old/net80211/ieee80211_var.h        2007-02-20 23:24:27.276770176 +0100 
    94 +++ madwifi.dev/net80211/ieee80211_var.h        2007-02-20 23:23:54.715720208 +0100 
    95 @@ -37,7 +37,7 @@ 
    96  /* 
    97   * Definitions for IEEE 802.11 drivers. 
    98   */ 
     104diff -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@@ -35,8 +35,8 @@ 
     108 #ifndef _NET80211_IEEE80211_VAR_H_ 
     109 #define _NET80211_IEEE80211_VAR_H_ 
     110  
    99111-#define        IEEE80211_DEBUG 
     112-#define        IEEE80211_DEBUG_REFCNT                  /* Node reference count debugging */ 
    100113+#undef IEEE80211_DEBUG 
    101  #undef IEEE80211_DEBUG_REFCNT                  /* node refcnt stuff */ 
     114+#undef IEEE80211_DEBUG_REFCNT                  /* Node reference count debugging */ 
    102115  
     116 /* Definitions for IEEE 802.11 drivers. */ 
    103117 #include <net80211/ieee80211_linux.h> 
    104 diff -ur madwifi.old/tools/do_multi.c madwifi.dev/tools/do_multi.c 
    105 --- madwifi.old/tools/do_multi.c        2007-02-20 23:24:27.276770176 +0100 
    106 +++ madwifi.dev/tools/do_multi.c        2007-02-20 23:23:54.715720208 +0100 
     118diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/do_multi.c madwifi-ng-refcount-r2313-20070505.dev/tools/do_multi.c 
     119--- madwifi-ng-refcount-r2313-20070505.old/tools/do_multi.c     2007-05-13 18:17:55.192178552 +0200 
     120+++ madwifi-ng-refcount-r2313-20070505.dev/tools/do_multi.c     2007-05-13 18:17:56.461985512 +0200 
    107121@@ -9,16 +9,20 @@ 
    108122  
     
    126140        ret =  athkey_init(argc, argv); 
    127141     if(strcmp(progname, "athstats") == 0) 
    128 diff -ur madwifi.old/tools/Makefile madwifi.dev/tools/Makefile 
    129 --- madwifi.old/tools/Makefile  2007-02-20 23:24:27.276770176 +0100 
    130 +++ madwifi.dev/tools/Makefile  2007-02-20 23:23:54.716720056 +0100 
     142diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/Makefile madwifi-ng-refcount-r2313-20070505.dev/tools/Makefile 
     143--- madwifi-ng-refcount-r2313-20070505.old/tools/Makefile       2007-05-13 18:17:55.192178552 +0200 
     144+++ madwifi-ng-refcount-r2313-20070505.dev/tools/Makefile       2007-05-13 18:17:56.461985512 +0200 
    131145@@ -52,7 +52,7 @@ 
    132146         
Note: See TracChangeset for help on using the changeset viewer.