diff options
Diffstat (limited to 'package/madwifi')
24 files changed, 160 insertions, 160 deletions
diff --git a/package/madwifi/patches/100-kernel_cflags.patch b/package/madwifi/patches/100-kernel_cflags.patch index b1c43aa..7956abc 100644 --- a/package/madwifi/patches/100-kernel_cflags.patch +++ b/package/madwifi/patches/100-kernel_cflags.patch @@ -1,7 +1,7 @@ Index: madwifi-ng-r2568-20070710/hal/public/mips-be-elf.inc =================================================================== ---- madwifi-ng-r2568-20070710.orig/hal/public/mips-be-elf.inc 2007-07-13 11:18:14.641130895 +0200 -+++ madwifi-ng-r2568-20070710/hal/public/mips-be-elf.inc 2007-07-13 11:18:14.797139785 +0200 +--- madwifi-ng-r2568-20070710.orig/hal/public/mips-be-elf.inc 2007-07-23 01:48:38.974201182 +0200 ++++ madwifi-ng-r2568-20070710/hal/public/mips-be-elf.inc 2007-07-23 01:48:39.166212125 +0200 @@ -71,5 +71,5 @@ LDOPTS= -EB @@ -11,8 +11,8 @@ Index: madwifi-ng-r2568-20070710/hal/public/mips-be-elf.inc -fno-strict-aliasing -fno-common -fomit-frame-pointer -mlong-calls Index: madwifi-ng-r2568-20070710/hal/public/mips-le-elf.inc =================================================================== ---- madwifi-ng-r2568-20070710.orig/hal/public/mips-le-elf.inc 2007-07-13 11:18:14.645131124 +0200 -+++ madwifi-ng-r2568-20070710/hal/public/mips-le-elf.inc 2007-07-13 11:18:14.801140014 +0200 +--- madwifi-ng-r2568-20070710.orig/hal/public/mips-le-elf.inc 2007-07-23 01:48:38.982201640 +0200 ++++ madwifi-ng-r2568-20070710/hal/public/mips-le-elf.inc 2007-07-23 01:48:39.170212355 +0200 @@ -68,5 +68,5 @@ LDOPTS= -EL @@ -22,8 +22,8 @@ Index: madwifi-ng-r2568-20070710/hal/public/mips-le-elf.inc -fno-strict-aliasing -fno-common -fomit-frame-pointer -mlong-calls Index: madwifi-ng-r2568-20070710/hal/public/xscale-be-elf.inc =================================================================== ---- madwifi-ng-r2568-20070710.orig/hal/public/xscale-be-elf.inc 2007-07-13 11:18:14.657131806 +0200 -+++ madwifi-ng-r2568-20070710/hal/public/xscale-be-elf.inc 2007-07-13 11:18:14.821141156 +0200 +--- madwifi-ng-r2568-20070710.orig/hal/public/xscale-be-elf.inc 2007-07-23 01:48:38.990202093 +0200 ++++ madwifi-ng-r2568-20070710/hal/public/xscale-be-elf.inc 2007-07-23 01:48:39.194213721 +0200 @@ -77,5 +77,5 @@ LDOPTS= -EB diff --git a/package/madwifi/patches/102-multicall_binary.patch b/package/madwifi/patches/102-multicall_binary.patch index 3b31f0e..bd31d96 100644 --- a/package/madwifi/patches/102-multicall_binary.patch +++ b/package/madwifi/patches/102-multicall_binary.patch @@ -1,7 +1,7 @@ Index: madwifi-ng-r2568-20070710/tools/80211debug.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/tools/80211debug.c 2007-07-13 11:18:14.513123601 +0200 -+++ madwifi-ng-r2568-20070710/tools/80211debug.c 2007-07-13 11:18:15.097156885 +0200 +--- madwifi-ng-r2568-20070710.orig/tools/80211debug.c 2007-07-23 01:48:38.846193887 +0200 ++++ madwifi-ng-r2568-20070710/tools/80211debug.c 2007-07-23 01:48:39.578235605 +0200 @@ -49,6 +49,10 @@ #include <getopt.h> #include <err.h> @@ -35,8 +35,8 @@ Index: madwifi-ng-r2568-20070710/tools/80211debug.c const char *sep; Index: madwifi-ng-r2568-20070710/tools/80211stats.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/tools/80211stats.c 2007-07-13 11:18:14.517123827 +0200 -+++ madwifi-ng-r2568-20070710/tools/80211stats.c 2007-07-13 11:18:15.101157110 +0200 +--- madwifi-ng-r2568-20070710.orig/tools/80211stats.c 2007-07-23 01:48:38.854194346 +0200 ++++ madwifi-ng-r2568-20070710/tools/80211stats.c 2007-07-23 01:48:39.578235605 +0200 @@ -60,6 +60,10 @@ #include "net80211/ieee80211_crypto.h" #include "net80211/ieee80211_ioctl.h" @@ -70,8 +70,8 @@ Index: madwifi-ng-r2568-20070710/tools/80211stats.c u_int8_t buf[24*1024], *cp; Index: madwifi-ng-r2568-20070710/tools/athchans.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/tools/athchans.c 2007-07-13 11:18:14.525124286 +0200 -+++ madwifi-ng-r2568-20070710/tools/athchans.c 2007-07-13 11:18:15.121158252 +0200 +--- madwifi-ng-r2568-20070710.orig/tools/athchans.c 2007-07-23 01:48:38.858194572 +0200 ++++ madwifi-ng-r2568-20070710/tools/athchans.c 2007-07-23 01:48:39.598236745 +0200 @@ -59,6 +59,10 @@ #include "net80211/ieee80211_crypto.h" #include "net80211/ieee80211_ioctl.h" @@ -106,8 +106,8 @@ Index: madwifi-ng-r2568-20070710/tools/athchans.c int c; Index: madwifi-ng-r2568-20070710/tools/athctrl.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/tools/athctrl.c 2007-07-13 11:18:14.533124742 +0200 -+++ madwifi-ng-r2568-20070710/tools/athctrl.c 2007-07-13 11:18:15.149159848 +0200 +--- madwifi-ng-r2568-20070710.orig/tools/athctrl.c 2007-07-23 01:48:38.866195027 +0200 ++++ madwifi-ng-r2568-20070710/tools/athctrl.c 2007-07-23 01:48:39.626238340 +0200 @@ -53,6 +53,10 @@ #include <net/if.h> @@ -141,8 +141,8 @@ Index: madwifi-ng-r2568-20070710/tools/athctrl.c int c; Index: madwifi-ng-r2568-20070710/tools/athdebug.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/tools/athdebug.c 2007-07-13 11:18:14.537124968 +0200 -+++ madwifi-ng-r2568-20070710/tools/athdebug.c 2007-07-13 11:18:15.169160989 +0200 +--- madwifi-ng-r2568-20070710.orig/tools/athdebug.c 2007-07-23 01:48:38.874195486 +0200 ++++ madwifi-ng-r2568-20070710/tools/athdebug.c 2007-07-23 01:48:39.650239706 +0200 @@ -52,6 +52,10 @@ #include <getopt.h> #include <err.h> @@ -177,8 +177,8 @@ Index: madwifi-ng-r2568-20070710/tools/athdebug.c #else Index: madwifi-ng-r2568-20070710/tools/athkey.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/tools/athkey.c 2007-07-13 11:18:14.545125427 +0200 -+++ madwifi-ng-r2568-20070710/tools/athkey.c 2007-07-13 11:18:15.197162582 +0200 +--- madwifi-ng-r2568-20070710.orig/tools/athkey.c 2007-07-23 01:48:38.878195712 +0200 ++++ madwifi-ng-r2568-20070710/tools/athkey.c 2007-07-23 01:48:39.698242443 +0200 @@ -59,6 +59,10 @@ #include "net80211/ieee80211_crypto.h" #include "net80211/ieee80211_ioctl.h" @@ -212,8 +212,8 @@ Index: madwifi-ng-r2568-20070710/tools/athkey.c struct ieee80211req_del_key delkey; Index: madwifi-ng-r2568-20070710/tools/athstats.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/tools/athstats.c 2007-07-13 11:18:14.553125879 +0200 -+++ madwifi-ng-r2568-20070710/tools/athstats.c 2007-07-13 11:18:15.237164863 +0200 +--- madwifi-ng-r2568-20070710.orig/tools/athstats.c 2007-07-23 01:48:38.886196167 +0200 ++++ madwifi-ng-r2568-20070710/tools/athstats.c 2007-07-23 01:48:39.726244040 +0200 @@ -63,6 +63,10 @@ #include "wireless_copy.h" #include "if_athioctl.h" @@ -249,7 +249,7 @@ Index: madwifi-ng-r2568-20070710/tools/athstats.c Index: madwifi-ng-r2568-20070710/tools/do_multi.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ madwifi-ng-r2568-20070710/tools/do_multi.c 2007-07-13 11:18:15.265166457 +0200 ++++ madwifi-ng-r2568-20070710/tools/do_multi.c 2007-07-23 01:48:39.754245634 +0200 @@ -0,0 +1,30 @@ +#include <string.h> +#include "do_multi.h" @@ -278,13 +278,13 @@ Index: madwifi-ng-r2568-20070710/tools/do_multi.c + ret = athstats_init(argc, argv); + if(strcmp(progname, "wlanconfig") == 0) + ret = wlanconfig_init(argc, argv); -+ ++ + return ret; +} Index: madwifi-ng-r2568-20070710/tools/do_multi.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ madwifi-ng-r2568-20070710/tools/do_multi.h 2007-07-13 11:18:15.293168054 +0200 ++++ madwifi-ng-r2568-20070710/tools/do_multi.h 2007-07-23 01:48:39.778247001 +0200 @@ -0,0 +1,9 @@ + +int a80211debug_init(int argc, char *argv[]); @@ -297,8 +297,8 @@ Index: madwifi-ng-r2568-20070710/tools/do_multi.h +int wlanconfig_init(int argc, char *argv[]); Index: madwifi-ng-r2568-20070710/tools/Makefile =================================================================== ---- madwifi-ng-r2568-20070710.orig/tools/Makefile 2007-07-13 11:18:14.569126791 +0200 -+++ madwifi-ng-r2568-20070710/tools/Makefile 2007-07-13 11:18:15.313169194 +0200 +--- madwifi-ng-r2568-20070710.orig/tools/Makefile 2007-07-23 01:48:38.902197078 +0200 ++++ madwifi-ng-r2568-20070710/tools/Makefile 2007-07-23 01:48:39.798248141 +0200 @@ -49,6 +49,12 @@ ALL= athstats 80211stats athkey athchans athctrl \ @@ -306,7 +306,7 @@ Index: madwifi-ng-r2568-20070710/tools/Makefile + +ifdef DOMULTI +OBJS= do_multi.o athstats.o 80211stats.o athkey.o athchans.o athctrl.o \ -+ athdebug.o 80211debug.o wlanconfig.o ++ athdebug.o 80211debug.o wlanconfig.o +ALL= ${OBJS} madwifi_multi +endif @@ -345,8 +345,8 @@ Index: madwifi-ng-r2568-20070710/tools/Makefile 80211stats: 80211stats.c Index: madwifi-ng-r2568-20070710/tools/wlanconfig.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/tools/wlanconfig.c 2007-07-13 11:18:14.577127250 +0200 -+++ madwifi-ng-r2568-20070710/tools/wlanconfig.c 2007-07-13 11:18:15.337170561 +0200 +--- madwifi-ng-r2568-20070710.orig/tools/wlanconfig.c 2007-07-23 01:48:38.910197536 +0200 ++++ madwifi-ng-r2568-20070710/tools/wlanconfig.c 2007-07-23 01:48:39.850251108 +0200 @@ -62,6 +62,10 @@ #include "net80211/ieee80211_crypto.h" #include "net80211/ieee80211_ioctl.h" diff --git a/package/madwifi/patches/104-autocreate_none.patch b/package/madwifi/patches/104-autocreate_none.patch index 875de05..667f026 100644 --- a/package/madwifi/patches/104-autocreate_none.patch +++ b/package/madwifi/patches/104-autocreate_none.patch @@ -1,7 +1,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/ath/if_ath.c 2007-07-13 11:18:14.437119270 +0200 -+++ madwifi-ng-r2568-20070710/ath/if_ath.c 2007-07-13 11:18:15.697191079 +0200 +--- madwifi-ng-r2568-20070710.orig/ath/if_ath.c 2007-07-23 01:48:38.770189557 +0200 ++++ madwifi-ng-r2568-20070710/ath/if_ath.c 2007-07-23 01:48:40.226272533 +0200 @@ -427,7 +427,7 @@ HAL_STATUS status; int error = 0; diff --git a/package/madwifi/patches/105-ratectl_attach.patch b/package/madwifi/patches/105-ratectl_attach.patch index 1e7cbeb..b17559b 100644 --- a/package/madwifi/patches/105-ratectl_attach.patch +++ b/package/madwifi/patches/105-ratectl_attach.patch @@ -1,7 +1,7 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_rate.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_rate.c 2007-07-13 11:18:14.361114937 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_rate.c 2007-07-13 11:18:15.945205212 +0200 +--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_rate.c 2007-07-23 01:48:38.694185224 +0200 ++++ madwifi-ng-r2568-20070710/net80211/ieee80211_rate.c 2007-07-23 01:48:40.474286668 +0200 @@ -100,8 +100,18 @@ ieee80211_load_module(buf); diff --git a/package/madwifi/patches/110-init_fix_PR_914.patch b/package/madwifi/patches/110-init_fix_PR_914.patch index 661946f..3715e2a 100644 --- a/package/madwifi/patches/110-init_fix_PR_914.patch +++ b/package/madwifi/patches/110-init_fix_PR_914.patch @@ -1,7 +1,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/ath/if_ath.c 2007-07-13 11:18:15.697191079 +0200 -+++ madwifi-ng-r2568-20070710/ath/if_ath.c 2007-07-13 11:18:16.181218662 +0200 +--- madwifi-ng-r2568-20070710.orig/ath/if_ath.c 2007-07-23 01:48:40.226272533 +0200 ++++ madwifi-ng-r2568-20070710/ath/if_ath.c 2007-07-23 01:48:40.726301028 +0200 @@ -1988,7 +1988,10 @@ ath_draintxq(sc); if (!sc->sc_invalid) { diff --git a/package/madwifi/patches/111-minstrel_crash.patch b/package/madwifi/patches/111-minstrel_crash.patch index a0065b6..fb0f32a 100644 --- a/package/madwifi/patches/111-minstrel_crash.patch +++ b/package/madwifi/patches/111-minstrel_crash.patch @@ -1,7 +1,7 @@ Index: madwifi-ng-r2568-20070710/ath_rate/minstrel/minstrel.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/ath_rate/minstrel/minstrel.c 2007-07-13 11:18:14.209106275 +0200 -+++ madwifi-ng-r2568-20070710/ath_rate/minstrel/minstrel.c 2007-07-13 11:18:16.433233021 +0200 +--- madwifi-ng-r2568-20070710.orig/ath_rate/minstrel/minstrel.c 2007-07-23 01:48:38.542176563 +0200 ++++ madwifi-ng-r2568-20070710/ath_rate/minstrel/minstrel.c 2007-07-23 01:48:40.974315165 +0200 @@ -388,6 +388,9 @@ struct minstrel_node *sn = ATH_NODE_MINSTREL(an); int rc1, rc2, rc3; /* Index into the rate table, so for example, it is 0..11 */ diff --git a/package/madwifi/patches/112-keycache_PR_962.patch b/package/madwifi/patches/112-keycache_PR_962.patch index 643190b..d2ea9cb 100644 --- a/package/madwifi/patches/112-keycache_PR_962.patch +++ b/package/madwifi/patches/112-keycache_PR_962.patch @@ -1,7 +1,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/ath/if_ath.c 2007-07-13 11:18:16.181218662 +0200 -+++ madwifi-ng-r2568-20070710/ath/if_ath.c 2007-07-13 11:18:16.669246471 +0200 +--- madwifi-ng-r2568-20070710.orig/ath/if_ath.c 2007-07-23 01:48:40.726301028 +0200 ++++ madwifi-ng-r2568-20070710/ath/if_ath.c 2007-07-23 01:48:41.230329754 +0200 @@ -5732,7 +5732,8 @@ * frame; it'll be dropped where it's not wanted. */ @@ -14,8 +14,8 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c * Fast path: node is present in the key map; Index: madwifi-ng-r2568-20070710/net80211/ieee80211_node.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_node.c 2007-07-13 11:18:14.117101033 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_node.c 2007-07-13 11:18:16.669246471 +0200 +--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_node.c 2007-07-23 01:48:38.458171774 +0200 ++++ madwifi-ng-r2568-20070710/net80211/ieee80211_node.c 2007-07-23 01:48:41.230329754 +0200 @@ -1271,8 +1271,6 @@ IEEE80211_NODE_TABLE_UNLOCK_IRQ(nt); @@ -48,8 +48,8 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_node.c * a data frame. This handles node discovery in adhoc networks. Index: madwifi-ng-r2568-20070710/net80211/ieee80211_node.h =================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_node.h 2007-07-13 11:18:14.125101490 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_node.h 2007-07-13 11:18:16.697248068 +0200 +--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_node.h 2007-07-23 01:48:38.466172232 +0200 ++++ madwifi-ng-r2568-20070710/net80211/ieee80211_node.h 2007-07-23 01:48:41.254331120 +0200 @@ -328,6 +328,8 @@ *pni = NULL; /* guard against use */ } diff --git a/package/madwifi/patches/113-no_ibss_pwrsave.patch b/package/madwifi/patches/113-no_ibss_pwrsave.patch index 15dfdce..24e7369 100644 --- a/package/madwifi/patches/113-no_ibss_pwrsave.patch +++ b/package/madwifi/patches/113-no_ibss_pwrsave.patch @@ -1,13 +1,13 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_scan.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_scan.c 2007-07-13 11:18:14.033096248 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_scan.c 2007-07-13 11:18:16.977264023 +0200 +--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_scan.c 2007-07-23 01:48:38.374166989 +0200 ++++ madwifi-ng-r2568-20070710/net80211/ieee80211_scan.c 2007-07-23 01:48:41.534347075 +0200 @@ -291,7 +291,8 @@ struct ieee80211com *ic = vap->iv_ic; int delay; - ieee80211_sta_pwrsave(vap, 1); -+ if (vap->iv_opmode != IEEE80211_M_IBSS) ++ if (vap->iv_opmode != IEEE80211_M_IBSS) + ieee80211_sta_pwrsave(vap, 1); /* * Use an initial 1ms delay to ensure the null diff --git a/package/madwifi/patches/116-adhoc_beacon_PR_1033.patch b/package/madwifi/patches/116-adhoc_beacon_PR_1033.patch index 34087a9..34eeca7 100644 --- a/package/madwifi/patches/116-adhoc_beacon_PR_1033.patch +++ b/package/madwifi/patches/116-adhoc_beacon_PR_1033.patch @@ -1,7 +1,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/ath/if_ath.c 2007-07-13 11:18:16.669246471 +0200 -+++ madwifi-ng-r2568-20070710/ath/if_ath.c 2007-07-13 11:18:17.213277476 +0200 +--- madwifi-ng-r2568-20070710.orig/ath/if_ath.c 2007-07-23 01:48:41.230329754 +0200 ++++ madwifi-ng-r2568-20070710/ath/if_ath.c 2007-07-23 01:48:41.758359843 +0200 @@ -4426,16 +4426,31 @@ struct ieee80211com *ic = &sc->sc_ic; struct ath_hal *ah = sc->sc_ah; diff --git a/package/madwifi/patches/120-soc_fix.patch b/package/madwifi/patches/120-soc_fix.patch index cd4486f..41a5fbb 100644 --- a/package/madwifi/patches/120-soc_fix.patch +++ b/package/madwifi/patches/120-soc_fix.patch @@ -1,7 +1,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath_ahb.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/ath/if_ath_ahb.c 2007-07-13 11:18:13.881087584 +0200 -+++ madwifi-ng-r2568-20070710/ath/if_ath_ahb.c 2007-07-13 11:18:17.461291609 +0200 +--- madwifi-ng-r2568-20070710.orig/ath/if_ath_ahb.c 2007-07-23 01:48:38.098151260 +0200 ++++ madwifi-ng-r2568-20070710/ath/if_ath_ahb.c 2007-07-23 01:48:41.998373519 +0200 @@ -275,11 +275,10 @@ diff --git a/package/madwifi/patches/121-ibss_hostap.patch b/package/madwifi/patches/121-ibss_hostap.patch index 3a0004c..939ee70 100644 --- a/package/madwifi/patches/121-ibss_hostap.patch +++ b/package/madwifi/patches/121-ibss_hostap.patch @@ -1,7 +1,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/ath/if_ath.c 2007-07-13 11:18:17.213277476 +0200 -+++ madwifi-ng-r2568-20070710/ath/if_ath.c 2007-07-13 11:18:17.733307111 +0200 +--- madwifi-ng-r2568-20070710.orig/ath/if_ath.c 2007-07-23 01:48:41.758359843 +0200 ++++ madwifi-ng-r2568-20070710/ath/if_ath.c 2007-07-23 01:48:42.258388337 +0200 @@ -410,7 +410,6 @@ * and use the next two bits as the index of the VAP. */ @@ -151,8 +151,8 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c ieee80211_keyix_t keyix; Index: madwifi-ng-r2568-20070710/ath/if_athvar.h =================================================================== ---- madwifi-ng-r2568-20070710.orig/ath/if_athvar.h 2007-07-13 11:18:13.781081883 +0200 -+++ madwifi-ng-r2568-20070710/ath/if_athvar.h 2007-07-13 11:18:17.737307338 +0200 +--- madwifi-ng-r2568-20070710.orig/ath/if_athvar.h 2007-07-23 01:48:38.006146018 +0200 ++++ madwifi-ng-r2568-20070710/ath/if_athvar.h 2007-07-23 01:48:42.262388566 +0200 @@ -204,7 +204,7 @@ #define ATH_RXBUF 40 /* number of RX buffers */ #define ATH_TXBUF 200 /* number of TX buffers */ @@ -172,8 +172,8 @@ Index: madwifi-ng-r2568-20070710/ath/if_athvar.h HAL_INT sc_imask; /* interrupt mask copy */ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_beacon.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_beacon.c 2007-07-13 11:18:13.785082112 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_beacon.c 2007-07-13 11:18:17.857314176 +0200 +--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_beacon.c 2007-07-23 01:48:38.010146245 +0200 ++++ madwifi-ng-r2568-20070710/net80211/ieee80211_beacon.c 2007-07-23 01:48:42.278389477 +0200 @@ -111,7 +111,7 @@ bo->bo_tim = frm; @@ -185,8 +185,8 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_beacon.c *frm++ = 0; *frm++ = 0; /* TODO: ATIM window */ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_input.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_input.c 2007-07-13 11:18:13.793082567 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_input.c 2007-07-13 11:18:17.885315771 +0200 +--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_input.c 2007-07-23 01:48:38.018146699 +0200 ++++ madwifi-ng-r2568-20070710/net80211/ieee80211_input.c 2007-07-23 01:48:42.282389707 +0200 @@ -2981,7 +2981,13 @@ return; } @@ -219,8 +219,8 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_input.c IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_INPUT, wh->i_addr2, Index: madwifi-ng-r2568-20070710/net80211/ieee80211_node.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_node.c 2007-07-13 11:18:16.669246471 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_node.c 2007-07-13 11:18:17.925318050 +0200 +--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_node.c 2007-07-23 01:48:41.230329754 +0200 ++++ madwifi-ng-r2568-20070710/net80211/ieee80211_node.c 2007-07-23 01:48:42.330392441 +0200 @@ -1084,8 +1084,25 @@ IEEE80211_NODE_TABLE_LOCK_ASSERT(nt); diff --git a/package/madwifi/patches/122-replayfail_workaround.patch b/package/madwifi/patches/122-replayfail_workaround.patch index 0c376e7..a504018 100644 --- a/package/madwifi/patches/122-replayfail_workaround.patch +++ b/package/madwifi/patches/122-replayfail_workaround.patch @@ -1,7 +1,7 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_linux.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_linux.c 2007-07-13 11:18:13.701077325 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_linux.c 2007-07-13 11:18:18.229335376 +0200 +--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_linux.c 2007-07-23 01:48:37.914140773 +0200 ++++ madwifi-ng-r2568-20070710/net80211/ieee80211_linux.c 2007-07-23 01:48:42.626409310 +0200 @@ -285,6 +285,9 @@ k->wk_cipher->ic_name, k->wk_keyix, (unsigned long long)rsc ); diff --git a/package/madwifi/patches/123-ccmp_checks.patch b/package/madwifi/patches/123-ccmp_checks.patch index 6356b7f..69fa3c3 100644 --- a/package/madwifi/patches/123-ccmp_checks.patch +++ b/package/madwifi/patches/123-ccmp_checks.patch @@ -1,7 +1,7 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_ccmp.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_crypto_ccmp.c 2007-07-13 11:18:13.625072992 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_ccmp.c 2007-07-13 11:18:18.465348826 +0200 +--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_crypto_ccmp.c 2007-07-23 01:48:37.830135985 +0200 ++++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_ccmp.c 2007-07-23 01:48:42.870423216 +0200 @@ -475,6 +475,9 @@ uint8_t *mic, *pos; u_int space; diff --git a/package/madwifi/patches/124-linux24_compat.patch b/package/madwifi/patches/124-linux24_compat.patch index 3b08995..21b4a83 100644 --- a/package/madwifi/patches/124-linux24_compat.patch +++ b/package/madwifi/patches/124-linux24_compat.patch @@ -1,7 +1,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_athvar.h =================================================================== ---- madwifi-ng-r2568-20070710.orig/ath/if_athvar.h 2007-07-13 11:18:17.737307338 +0200 -+++ madwifi-ng-r2568-20070710/ath/if_athvar.h 2007-07-13 11:18:18.709362732 +0200 +--- madwifi-ng-r2568-20070710.orig/ath/if_athvar.h 2007-07-23 01:48:42.262388566 +0200 ++++ madwifi-ng-r2568-20070710/ath/if_athvar.h 2007-07-23 01:48:43.126437804 +0200 @@ -123,6 +123,11 @@ #define NETDEV_TX_BUSY 1 #endif diff --git a/package/madwifi/patches/125-tpc_PR_1435.patch b/package/madwifi/patches/125-tpc_PR_1435.patch index 2ca624f..a4c557f 100644 --- a/package/madwifi/patches/125-tpc_PR_1435.patch +++ b/package/madwifi/patches/125-tpc_PR_1435.patch @@ -1,7 +1,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/ath/if_ath.c 2007-07-13 11:18:17.733307111 +0200 -+++ madwifi-ng-r2568-20070710/ath/if_ath.c 2007-07-13 11:18:18.945376179 +0200 +--- madwifi-ng-r2568-20070710.orig/ath/if_ath.c 2007-07-23 01:48:42.258388337 +0200 ++++ madwifi-ng-r2568-20070710/ath/if_ath.c 2007-07-23 01:48:43.370451713 +0200 @@ -273,9 +273,7 @@ static char *autocreate = NULL; static char *ratectl = DEF_RATE_CTL; @@ -88,8 +88,8 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c Index: madwifi-ng-r2568-20070710/net80211/ieee80211_wireless.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_wireless.c 2007-07-13 11:18:13.473064331 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_wireless.c 2007-07-13 11:18:18.949376408 +0200 +--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_wireless.c 2007-07-23 01:48:37.670126869 +0200 ++++ madwifi-ng-r2568-20070710/net80211/ieee80211_wireless.c 2007-07-23 01:48:43.374451939 +0200 @@ -1403,6 +1403,7 @@ } else { if (!fixed) /* no change */ diff --git a/package/madwifi/patches/126-rxerr_frames.patch b/package/madwifi/patches/126-rxerr_frames.patch index ddf7d18..5918906 100644 --- a/package/madwifi/patches/126-rxerr_frames.patch +++ b/package/madwifi/patches/126-rxerr_frames.patch @@ -1,7 +1,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/ath/if_ath.c 2007-07-13 11:18:18.945376179 +0200 -+++ madwifi-ng-r2568-20070710/ath/if_ath.c 2007-07-13 11:18:19.221391908 +0200 +--- madwifi-ng-r2568-20070710.orig/ath/if_ath.c 2007-07-23 01:48:43.370451713 +0200 ++++ madwifi-ng-r2568-20070710/ath/if_ath.c 2007-07-23 01:48:43.690469948 +0200 @@ -5711,8 +5711,9 @@ /* * Reject error frames if we have no vaps that diff --git a/package/madwifi/patches/127-beacon_node.patch b/package/madwifi/patches/127-beacon_node.patch index b404962..f992af9 100644 --- a/package/madwifi/patches/127-beacon_node.patch +++ b/package/madwifi/patches/127-beacon_node.patch @@ -1,7 +1,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/ath/if_ath.c 2007-07-19 16:58:58.416164190 +0200 -+++ madwifi-ng-r2568-20070710/ath/if_ath.c 2007-07-19 16:59:28.677888709 +0200 +--- madwifi-ng-r2568-20070710.orig/ath/if_ath.c 2007-07-23 01:48:43.690469948 +0200 ++++ madwifi-ng-r2568-20070710/ath/if_ath.c 2007-07-23 01:48:43.942484311 +0200 @@ -4027,6 +4027,8 @@ } bf = avp->av_bcbuf; diff --git a/package/madwifi/patches/200-no_debug.patch b/package/madwifi/patches/200-no_debug.patch index 051b1fd..b1830c6 100644 --- a/package/madwifi/patches/200-no_debug.patch +++ b/package/madwifi/patches/200-no_debug.patch @@ -1,7 +1,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/ath/if_ath.c 2007-07-13 11:18:19.221391908 +0200 -+++ madwifi-ng-r2568-20070710/ath/if_ath.c 2007-07-13 11:18:19.473406270 +0200 +--- madwifi-ng-r2568-20070710.orig/ath/if_ath.c 2007-07-23 01:48:43.942484311 +0200 ++++ madwifi-ng-r2568-20070710/ath/if_ath.c 2007-07-23 01:48:44.466514171 +0200 @@ -75,7 +75,7 @@ #include <net80211/if_llc.h> #endif @@ -13,8 +13,8 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c #include "if_athvar.h" Index: madwifi-ng-r2568-20070710/ath_rate/amrr/amrr.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/ath_rate/amrr/amrr.c 2007-07-13 11:18:13.277053162 +0200 -+++ madwifi-ng-r2568-20070710/ath_rate/amrr/amrr.c 2007-07-13 11:18:19.473406270 +0200 +--- madwifi-ng-r2568-20070710.orig/ath_rate/amrr/amrr.c 2007-07-23 01:48:37.298105667 +0200 ++++ madwifi-ng-r2568-20070710/ath_rate/amrr/amrr.c 2007-07-23 01:48:44.470514400 +0200 @@ -70,7 +70,7 @@ #include "amrr.h" @@ -26,8 +26,8 @@ Index: madwifi-ng-r2568-20070710/ath_rate/amrr/amrr.c if (sc->sc_debug & 0x10) \ Index: madwifi-ng-r2568-20070710/ath_rate/minstrel/minstrel.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/ath_rate/minstrel/minstrel.c 2007-07-13 11:18:16.433233021 +0200 -+++ madwifi-ng-r2568-20070710/ath_rate/minstrel/minstrel.c 2007-07-13 11:18:19.497407640 +0200 +--- madwifi-ng-r2568-20070710.orig/ath_rate/minstrel/minstrel.c 2007-07-23 01:48:40.974315165 +0200 ++++ madwifi-ng-r2568-20070710/ath_rate/minstrel/minstrel.c 2007-07-23 01:48:44.494515770 +0200 @@ -117,7 +117,7 @@ #include "minstrel.h" @@ -39,8 +39,8 @@ Index: madwifi-ng-r2568-20070710/ath_rate/minstrel/minstrel.c ATH_DEBUG_RATE = 0x00000010 /* rate control */ Index: madwifi-ng-r2568-20070710/ath_rate/onoe/onoe.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/ath_rate/onoe/onoe.c 2007-07-13 11:18:13.293054074 +0200 -+++ madwifi-ng-r2568-20070710/ath_rate/onoe/onoe.c 2007-07-13 11:18:19.525409234 +0200 +--- madwifi-ng-r2568-20070710.orig/ath_rate/onoe/onoe.c 2007-07-23 01:48:37.314106578 +0200 ++++ madwifi-ng-r2568-20070710/ath_rate/onoe/onoe.c 2007-07-23 01:48:44.518517136 +0200 @@ -66,7 +66,7 @@ #include "onoe.h" @@ -52,8 +52,8 @@ Index: madwifi-ng-r2568-20070710/ath_rate/onoe/onoe.c ATH_DEBUG_RATE = 0x00000010, /* rate control */ Index: madwifi-ng-r2568-20070710/ath_rate/sample/sample.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/ath_rate/sample/sample.c 2007-07-13 11:18:13.301054529 +0200 -+++ madwifi-ng-r2568-20070710/ath_rate/sample/sample.c 2007-07-13 11:18:19.549410604 +0200 +--- madwifi-ng-r2568-20070710.orig/ath_rate/sample/sample.c 2007-07-23 01:48:37.322107035 +0200 ++++ madwifi-ng-r2568-20070710/ath_rate/sample/sample.c 2007-07-23 01:48:44.546518731 +0200 @@ -68,7 +68,7 @@ #include "sample.h" @@ -65,8 +65,8 @@ Index: madwifi-ng-r2568-20070710/ath_rate/sample/sample.c ATH_DEBUG_NODE = 0x00080000, /* node management */ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_proto.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_proto.c 2007-07-13 11:18:13.309054985 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_proto.c 2007-07-13 11:18:19.601413567 +0200 +--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_proto.c 2007-07-23 01:48:37.330107492 +0200 ++++ madwifi-ng-r2568-20070710/net80211/ieee80211_proto.c 2007-07-23 01:48:44.570520097 +0200 @@ -286,6 +286,7 @@ } EXPORT_SYMBOL(ieee80211_aclator_get); @@ -85,8 +85,8 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_proto.c const u_int8_t *buf, int len, int rate, int rssi) Index: madwifi-ng-r2568-20070710/net80211/ieee80211_var.h =================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_var.h 2007-07-13 11:18:13.317055440 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_var.h 2007-07-13 11:18:19.625414935 +0200 +--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_var.h 2007-07-23 01:48:37.338107946 +0200 ++++ madwifi-ng-r2568-20070710/net80211/ieee80211_var.h 2007-07-23 01:48:44.622523064 +0200 @@ -35,8 +35,8 @@ #ifndef _NET80211_IEEE80211_VAR_H_ #define _NET80211_IEEE80211_VAR_H_ @@ -100,8 +100,8 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_var.h #include <net80211/ieee80211_linux.h> Index: madwifi-ng-r2568-20070710/tools/do_multi.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/tools/do_multi.c 2007-07-13 11:18:15.265166457 +0200 -+++ madwifi-ng-r2568-20070710/tools/do_multi.c 2007-07-13 11:18:19.653416531 +0200 +--- madwifi-ng-r2568-20070710.orig/tools/do_multi.c 2007-07-23 01:48:39.754245634 +0200 ++++ madwifi-ng-r2568-20070710/tools/do_multi.c 2007-07-23 01:48:44.650524656 +0200 @@ -9,16 +9,20 @@ progname = basename(argv[0]); @@ -125,13 +125,13 @@ Index: madwifi-ng-r2568-20070710/tools/do_multi.c if(strcmp(progname, "athstats") == 0) Index: madwifi-ng-r2568-20070710/tools/Makefile =================================================================== ---- madwifi-ng-r2568-20070710.orig/tools/Makefile 2007-07-13 11:18:15.313169194 +0200 -+++ madwifi-ng-r2568-20070710/tools/Makefile 2007-07-13 11:18:19.673417671 +0200 +--- madwifi-ng-r2568-20070710.orig/tools/Makefile 2007-07-23 01:48:39.798248141 +0200 ++++ madwifi-ng-r2568-20070710/tools/Makefile 2007-07-23 01:48:44.670525796 +0200 @@ -52,7 +52,7 @@ ifdef DOMULTI OBJS= do_multi.o athstats.o 80211stats.o athkey.o athchans.o athctrl.o \ -- athdebug.o 80211debug.o wlanconfig.o +- athdebug.o 80211debug.o wlanconfig.o + wlanconfig.o ALL= ${OBJS} madwifi_multi endif diff --git a/package/madwifi/patches/300-napi_polling.patch b/package/madwifi/patches/300-napi_polling.patch index 526cf1e..0bc05c0 100644 --- a/package/madwifi/patches/300-napi_polling.patch +++ b/package/madwifi/patches/300-napi_polling.patch @@ -1,7 +1,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/ath/if_ath.c 2007-07-13 11:18:19.473406270 +0200 -+++ madwifi-ng-r2568-20070710/ath/if_ath.c 2007-07-13 11:18:20.017437275 +0200 +--- madwifi-ng-r2568-20070710.orig/ath/if_ath.c 2007-07-23 01:48:44.466514171 +0200 ++++ madwifi-ng-r2568-20070710/ath/if_ath.c 2007-07-23 01:48:45.030546315 +0200 @@ -170,7 +170,7 @@ int, u_int64_t); static void ath_setdefantenna(struct ath_softc *, u_int); @@ -86,7 +86,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c } /* -@@ -5584,13 +5598,12 @@ +@@ -5586,13 +5600,12 @@ sc->sc_rxotherant = 0; } @@ -102,7 +102,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c struct ath_buf *bf; struct ath_softc *sc = dev->priv; struct ieee80211com *ic = &sc->sc_ic; -@@ -5603,12 +5616,15 @@ +@@ -5605,12 +5618,15 @@ int type; u_int phyerr; u_int64_t rs_tsf; @@ -118,7 +118,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c do { bf = STAILQ_FIRST(&sc->sc_rxbuf); if (bf == NULL) { /* XXX ??? can this happen */ -@@ -5632,6 +5648,13 @@ +@@ -5634,6 +5650,13 @@ /* NB: never process the self-linked entry at the end */ break; } @@ -132,7 +132,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c skb = bf->bf_skb; if (skb == NULL) { /* XXX ??? can this happen */ printk("%s: no skbuff (%s)\n", DEV_NAME(dev), __func__); -@@ -5670,6 +5693,7 @@ +@@ -5672,6 +5695,7 @@ sc->sc_stats.ast_rx_phyerr++; phyerr = rs->rs_phyerr & 0x1f; sc->sc_stats.ast_rx_phy[phyerr]++; @@ -140,7 +140,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c } if (rs->rs_status & HAL_RXERR_DECRYPT) { /* -@@ -5887,9 +5911,33 @@ +@@ -5889,9 +5913,33 @@ STAILQ_INSERT_TAIL(&sc->sc_rxbuf, bf, bf_list); ATH_RXBUF_UNLOCK_IRQ(sc); } while (ath_rxbuf_init(sc, bf) == 0); @@ -174,7 +174,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c #undef PA2DESC } -@@ -7512,11 +7560,22 @@ +@@ -7514,11 +7562,22 @@ struct net_device *dev = (struct net_device *)data; struct ath_softc *sc = dev->priv; @@ -197,7 +197,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c netif_wake_queue(dev); if (sc->sc_softled) -@@ -7533,6 +7592,7 @@ +@@ -7535,6 +7594,7 @@ struct net_device *dev = (struct net_device *)data; struct ath_softc *sc = dev->priv; @@ -205,7 +205,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c /* * Process each active queue. */ -@@ -7553,6 +7613,16 @@ +@@ -7555,6 +7615,16 @@ if (sc->sc_uapsdq && txqactive(sc->sc_ah, sc->sc_uapsdq->axq_qnum)) ath_tx_processq(sc, sc->sc_uapsdq); @@ -222,7 +222,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c netif_wake_queue(dev); if (sc->sc_softled) -@@ -7570,6 +7640,7 @@ +@@ -7572,6 +7642,7 @@ unsigned int i; /* Process each active queue. */ @@ -230,7 +230,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c for (i = 0; i < HAL_NUM_TX_QUEUES; i++) if (ATH_TXQ_SETUP(sc, i) && txqactive(sc->sc_ah, i)) ath_tx_processq(sc, &sc->sc_txq[i]); -@@ -7578,6 +7649,16 @@ +@@ -7580,6 +7651,16 @@ ath_tx_processq(sc, sc->sc_xrtxq); #endif @@ -247,7 +247,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c netif_wake_queue(dev); if (sc->sc_softled) -@@ -7676,6 +7757,7 @@ +@@ -7678,6 +7759,7 @@ ath_draintxq(struct ath_softc *sc) { struct ath_hal *ah = sc->sc_ah; @@ -255,7 +255,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c unsigned int i; /* XXX return value */ -@@ -9184,9 +9266,9 @@ +@@ -9186,9 +9268,9 @@ dev->mtu = mtu; if ((dev->flags & IFF_RUNNING) && !sc->sc_invalid) { /* NB: the rx buffers may need to be reallocated */ @@ -269,8 +269,8 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c Index: madwifi-ng-r2568-20070710/ath/if_athvar.h =================================================================== ---- madwifi-ng-r2568-20070710.orig/ath/if_athvar.h 2007-07-13 11:18:18.709362732 +0200 -+++ madwifi-ng-r2568-20070710/ath/if_athvar.h 2007-07-13 11:18:20.017437275 +0200 +--- madwifi-ng-r2568-20070710.orig/ath/if_athvar.h 2007-07-23 01:48:43.126437804 +0200 ++++ madwifi-ng-r2568-20070710/ath/if_athvar.h 2007-07-23 01:48:45.030546315 +0200 @@ -49,6 +49,10 @@ #include "net80211/ieee80211.h" /* XXX for WME_NUM_AC */ #include <asm/io.h> @@ -309,8 +309,8 @@ Index: madwifi-ng-r2568-20070710/ath/if_athvar.h #define ATH_RXBUF_LOCK_DESTROY(_sc) Index: madwifi-ng-r2568-20070710/net80211/ieee80211_input.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_input.c 2007-07-13 11:18:17.885315771 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_input.c 2007-07-13 11:18:20.045438868 +0200 +--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_input.c 2007-07-23 01:48:44.214499810 +0200 ++++ madwifi-ng-r2568-20070710/net80211/ieee80211_input.c 2007-07-23 01:48:45.030546315 +0200 @@ -1128,8 +1128,9 @@ if (ni->ni_vlan != 0 && vap->iv_vlgrp != NULL) { /* attach vlan tag */ diff --git a/package/madwifi/patches/301-tx_locking.patch b/package/madwifi/patches/301-tx_locking.patch index bdfecd8..5657535 100644 --- a/package/madwifi/patches/301-tx_locking.patch +++ b/package/madwifi/patches/301-tx_locking.patch @@ -1,7 +1,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/ath/if_ath.c 2007-07-13 11:18:20.017437275 +0200 -+++ madwifi-ng-r2568-20070710/ath/if_ath.c 2007-07-13 11:18:20.353456423 +0200 +--- madwifi-ng-r2568-20070710.orig/ath/if_ath.c 2007-07-23 01:48:45.030546315 +0200 ++++ madwifi-ng-r2568-20070710/ath/if_ath.c 2007-07-23 01:48:45.406567742 +0200 @@ -2558,7 +2558,7 @@ /* NB: use this lock to protect an->an_tx_ffbuf (and txq->axq_stageq) * in athff_can_aggregate() call too. @@ -64,8 +64,8 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c ff_bypass: Index: madwifi-ng-r2568-20070710/ath/if_athvar.h =================================================================== ---- madwifi-ng-r2568-20070710.orig/ath/if_athvar.h 2007-07-13 11:18:20.017437275 +0200 -+++ madwifi-ng-r2568-20070710/ath/if_athvar.h 2007-07-13 11:18:20.353456423 +0200 +--- madwifi-ng-r2568-20070710.orig/ath/if_athvar.h 2007-07-23 01:48:45.030546315 +0200 ++++ madwifi-ng-r2568-20070710/ath/if_athvar.h 2007-07-23 01:48:45.406567742 +0200 @@ -497,6 +497,8 @@ #define ATH_TXQ_INTR_PERIOD 5 /* axq_intrcnt period for intr gen */ #define ATH_TXQ_LOCK_INIT(_tq) spin_lock_init(&(_tq)->axq_lock) diff --git a/package/madwifi/patches/305-pureg_fix.patch b/package/madwifi/patches/305-pureg_fix.patch index ed8fc76..a995397 100644 --- a/package/madwifi/patches/305-pureg_fix.patch +++ b/package/madwifi/patches/305-pureg_fix.patch @@ -1,7 +1,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/ath/if_ath.c 2007-07-13 11:18:20.353456423 +0200 -+++ madwifi-ng-r2568-20070710/ath/if_ath.c 2007-07-13 11:18:20.621471697 +0200 +--- madwifi-ng-r2568-20070710.orig/ath/if_ath.c 2007-07-23 01:48:45.406567742 +0200 ++++ madwifi-ng-r2568-20070710/ath/if_ath.c 2007-07-23 01:48:45.690583928 +0200 @@ -3384,7 +3384,9 @@ rfilt |= HAL_RX_FILTER_PROM; if (ic->ic_opmode == IEEE80211_M_STA || @@ -15,8 +15,8 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c rfilt |= (HAL_RX_FILTER_CONTROL | HAL_RX_FILTER_BEACON | Index: madwifi-ng-r2568-20070710/net80211/ieee80211_input.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_input.c 2007-07-13 11:18:20.045438868 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_input.c 2007-07-13 11:18:20.621471697 +0200 +--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_input.c 2007-07-23 01:48:45.030546315 +0200 ++++ madwifi-ng-r2568-20070710/net80211/ieee80211_input.c 2007-07-23 01:48:45.690583928 +0200 @@ -321,11 +321,12 @@ bssid = wh->i_addr3; } @@ -99,8 +99,8 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_input.c */ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_node.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_node.c 2007-07-13 11:18:17.925318050 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_node.c 2007-07-13 11:18:20.637472608 +0200 +--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_node.c 2007-07-23 01:48:42.330392441 +0200 ++++ madwifi-ng-r2568-20070710/net80211/ieee80211_node.c 2007-07-23 01:48:45.694584154 +0200 @@ -332,10 +332,16 @@ /* Update country ie information */ ieee80211_build_countryie(ic); @@ -122,8 +122,8 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_node.c } Index: madwifi-ng-r2568-20070710/net80211/ieee80211_proto.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_proto.c 2007-07-13 11:18:19.601413567 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_proto.c 2007-07-13 11:18:20.665474204 +0200 +--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_proto.c 2007-07-23 01:48:44.570520097 +0200 ++++ madwifi-ng-r2568-20070710/net80211/ieee80211_proto.c 2007-07-23 01:48:45.718585522 +0200 @@ -586,6 +586,28 @@ { 4, { 2, 4, 11, 22 } }, /* IEEE80211_MODE_TURBO_G (mixed b/g) */ }; @@ -155,8 +155,8 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_proto.c * specified mode. For 11b compatibility we mark only 11b Index: madwifi-ng-r2568-20070710/net80211/ieee80211_var.h =================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_var.h 2007-07-13 11:18:19.625414935 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_var.h 2007-07-13 11:18:20.705476482 +0200 +--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_var.h 2007-07-23 01:48:44.622523064 +0200 ++++ madwifi-ng-r2568-20070710/net80211/ieee80211_var.h 2007-07-23 01:48:45.734586433 +0200 @@ -592,6 +592,8 @@ void ieee80211_build_countryie(struct ieee80211com *); int ieee80211_media_setup(struct ieee80211com *, struct ifmedia *, u_int32_t, diff --git a/package/madwifi/patches/306-bstuck_calibrate.patch b/package/madwifi/patches/306-bstuck_calibrate.patch index b58966f..1729132 100644 --- a/package/madwifi/patches/306-bstuck_calibrate.patch +++ b/package/madwifi/patches/306-bstuck_calibrate.patch @@ -1,7 +1,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/ath/if_ath.c 2007-07-13 11:18:20.621471697 +0200 -+++ madwifi-ng-r2568-20070710/ath/if_ath.c 2007-07-13 11:18:21.021494493 +0200 +--- madwifi-ng-r2568-20070710.orig/ath/if_ath.c 2007-07-23 01:48:45.690583928 +0200 ++++ madwifi-ng-r2568-20070710/ath/if_ath.c 2007-07-23 01:48:46.026603077 +0200 @@ -153,6 +153,7 @@ static void ath_turbo_switch_mode(unsigned long); static int ath_check_beacon_done(struct ath_softc *); @@ -10,7 +10,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c static void ath_beacon_send(struct ath_softc *, int *); static void ath_beacon_start_adhoc(struct ath_softc *, struct ieee80211vap *); static void ath_beacon_return(struct ath_softc *, struct ath_buf *); -@@ -4173,7 +4174,7 @@ +@@ -4175,7 +4176,7 @@ DPRINTF(sc, ATH_DEBUG_BEACON_PROC, "%s: missed %u consecutive beacons\n", __func__, sc->sc_bmisscount); @@ -19,7 +19,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c ATH_SCHEDULE_TQUEUE(&sc->sc_bstucktq, needmark); return; } -@@ -4312,8 +4313,17 @@ +@@ -4314,8 +4315,17 @@ * check will be true, in which case return * without resetting the driver. */ @@ -38,7 +38,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c printk("%s: stuck beacon; resetting (bmiss count %u)\n", DEV_NAME(dev), sc->sc_bmisscount); ath_reset(dev); -@@ -8027,17 +8037,13 @@ +@@ -8029,17 +8039,13 @@ * Periodically recalibrate the PHY to account * for temperature/environment changes. */ @@ -57,7 +57,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c DPRINTF(sc, ATH_DEBUG_CALIBRATE, "%s: channel %u/%x\n", __func__, sc->sc_curchan.channel, sc->sc_curchan.channelFlags); -@@ -8055,15 +8061,26 @@ +@@ -8057,15 +8063,26 @@ __func__, sc->sc_curchan.channel); sc->sc_stats.ast_per_calfail++; } @@ -88,8 +88,8 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c static void Index: madwifi-ng-r2568-20070710/ath/if_athvar.h =================================================================== ---- madwifi-ng-r2568-20070710.orig/ath/if_athvar.h 2007-07-13 11:18:20.353456423 +0200 -+++ madwifi-ng-r2568-20070710/ath/if_athvar.h 2007-07-13 11:18:21.021494493 +0200 +--- madwifi-ng-r2568-20070710.orig/ath/if_athvar.h 2007-07-23 01:48:45.406567742 +0200 ++++ madwifi-ng-r2568-20070710/ath/if_athvar.h 2007-07-23 01:48:46.026603077 +0200 @@ -538,7 +538,8 @@ */ #define ATH_TXQ_MOVE_Q(_tqs,_tqd) ATH_TXQ_MOVE_MCASTQ(_tqs,_tqd) diff --git a/package/madwifi/patches/309-micfail_detect.patch b/package/madwifi/patches/309-micfail_detect.patch index 2fa74cc..ee5698f 100644 --- a/package/madwifi/patches/309-micfail_detect.patch +++ b/package/madwifi/patches/309-micfail_detect.patch @@ -1,8 +1,8 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/ath/if_ath.c 2007-07-13 11:18:21.021494493 +0200 -+++ madwifi-ng-r2568-20070710/ath/if_ath.c 2007-07-13 11:18:21.297510222 +0200 -@@ -5630,6 +5630,7 @@ +--- madwifi-ng-r2568-20070710.orig/ath/if_ath.c 2007-07-23 01:48:46.026603077 +0200 ++++ madwifi-ng-r2568-20070710/ath/if_ath.c 2007-07-23 01:48:46.310619260 +0200 +@@ -5632,6 +5632,7 @@ u_int64_t rs_tsf; u_int processed = 0, early_stop = 0; u_int rx_limit = dev->quota; @@ -10,7 +10,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c /* Let the 802.11 layer know about the new noise floor */ sc->sc_channoise = ath_hal_get_channel_noise(ah, &(sc->sc_curchan)); -@@ -5724,25 +5725,7 @@ +@@ -5726,25 +5727,7 @@ } if (rs->rs_status & HAL_RXERR_MIC) { sc->sc_stats.ast_rx_badmic++; @@ -37,7 +37,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c } /* * Reject error frames if we have no vaps that -@@ -5807,8 +5790,9 @@ +@@ -5809,8 +5792,9 @@ /* * Finished monitor mode handling, now reject * error frames before passing to other vaps @@ -48,7 +48,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c dev_kfree_skb(skb); skb = NULL; goto rx_next; -@@ -5839,6 +5823,27 @@ +@@ -5841,6 +5825,27 @@ sc->sc_hwmap[rs->rs_rate].ieeerate, rs->rs_rssi); @@ -78,8 +78,8 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c * pass the (referenced) node up to the 802.11 layer Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_ccmp.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_crypto_ccmp.c 2007-07-13 11:18:18.465348826 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_ccmp.c 2007-07-13 11:18:21.297510222 +0200 +--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_crypto_ccmp.c 2007-07-23 01:48:42.870423216 +0200 ++++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_ccmp.c 2007-07-23 01:48:46.310619260 +0200 @@ -73,7 +73,7 @@ static int ccmp_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t); static int ccmp_decap(struct ieee80211_key *, struct sk_buff *, int); @@ -100,8 +100,8 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_ccmp.c } Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto.h =================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_crypto.h 2007-07-13 11:18:12.749023072 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto.h 2007-07-13 11:18:21.317511359 +0200 +--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_crypto.h 2007-07-23 01:48:36.806077628 +0200 ++++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto.h 2007-07-23 01:48:46.326620171 +0200 @@ -145,7 +145,7 @@ int (*ic_encap)(struct ieee80211_key *, struct sk_buff *, u_int8_t); int (*ic_decap)(struct ieee80211_key *, struct sk_buff *, int); @@ -126,8 +126,8 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto.h /* Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_none.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_crypto_none.c 2007-07-13 11:18:12.757023527 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_none.c 2007-07-13 11:18:21.333512274 +0200 +--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_crypto_none.c 2007-07-23 01:48:36.810077857 +0200 ++++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_none.c 2007-07-23 01:48:46.342621086 +0200 @@ -52,7 +52,7 @@ static int none_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t); static int none_decap(struct ieee80211_key *, struct sk_buff *, int); @@ -148,8 +148,8 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_none.c Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_tkip.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_crypto_tkip.c 2007-07-13 11:18:12.765023983 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_tkip.c 2007-07-13 11:18:21.373514552 +0200 +--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_crypto_tkip.c 2007-07-23 01:48:36.818078312 +0200 ++++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_tkip.c 2007-07-23 01:48:46.362622225 +0200 @@ -57,7 +57,7 @@ static int tkip_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t); static int tkip_enmic(struct ieee80211_key *, struct sk_buff *, int); @@ -179,8 +179,8 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_tkip.c u8 mic0[IEEE80211_WEP_MICLEN]; Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_wep.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_crypto_wep.c 2007-07-13 11:18:12.769024209 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_wep.c 2007-07-13 11:18:21.393515692 +0200 +--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_crypto_wep.c 2007-07-23 01:48:36.826078768 +0200 ++++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_wep.c 2007-07-23 01:48:46.402624504 +0200 @@ -54,7 +54,7 @@ static int wep_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t); static int wep_decap(struct ieee80211_key *, struct sk_buff *, int); @@ -201,8 +201,8 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_wep.c } Index: madwifi-ng-r2568-20070710/net80211/ieee80211_input.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_input.c 2007-07-13 11:18:20.621471697 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_input.c 2007-07-13 11:18:21.417517061 +0200 +--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_input.c 2007-07-23 01:48:45.690583928 +0200 ++++ madwifi-ng-r2568-20070710/net80211/ieee80211_input.c 2007-07-23 01:48:46.406624734 +0200 @@ -632,7 +632,7 @@ * Next strip any MSDU crypto bits. */ @@ -262,8 +262,8 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_input.c * Debugging support. Index: madwifi-ng-r2568-20070710/net80211/ieee80211_proto.h =================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_proto.h 2007-07-13 11:18:12.785025121 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_proto.h 2007-07-13 11:18:21.441518427 +0200 +--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_proto.h 2007-07-23 01:48:36.838079452 +0200 ++++ madwifi-ng-r2568-20070710/net80211/ieee80211_proto.h 2007-07-23 01:48:46.438626555 +0200 @@ -91,6 +91,7 @@ void ieee80211_set11gbasicrates(struct ieee80211_rateset *, enum ieee80211_phymode); enum ieee80211_phymode ieee80211_get11gbasicrates(struct ieee80211_rateset *); @@ -274,8 +274,8 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_proto.h * Return the size of the 802.11 header for a management or data frame. Index: madwifi-ng-r2568-20070710/net80211/ieee80211_linux.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_linux.c 2007-07-13 11:18:18.229335376 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_linux.c 2007-07-13 11:18:21.485520935 +0200 +--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_linux.c 2007-07-23 01:48:42.626409310 +0200 ++++ madwifi-ng-r2568-20070710/net80211/ieee80211_linux.c 2007-07-23 01:48:46.462627924 +0200 @@ -291,8 +291,8 @@ /* TODO: needed parameters: count, keyid, key type, src address, TSC */ snprintf(buf, sizeof(buf), "%s(keyid=%d %scast addr=%s)", tag, @@ -289,8 +289,8 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_linux.c wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf); Index: madwifi-ng-r2568-20070710/net80211/ieee80211_output.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_output.c 2007-07-13 11:18:12.797025805 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_output.c 2007-07-13 11:18:21.509522302 +0200 +--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_output.c 2007-07-23 01:48:36.854080363 +0200 ++++ madwifi-ng-r2568-20070710/net80211/ieee80211_output.c 2007-07-23 01:48:46.466628154 +0200 @@ -1079,13 +1079,16 @@ cip = (struct ieee80211_cipher *) key->wk_cipher; ciphdrsize = cip->ic_header; @@ -313,8 +313,8 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_output.c * Allocate sk_buff for each subsequent fragment; First fragment Index: madwifi-ng-r2568-20070710/net80211/ieee80211_node.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_node.c 2007-07-13 11:18:20.637472608 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_node.c 2007-07-13 11:18:21.533523672 +0200 +--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_node.c 2007-07-23 01:48:45.694584154 +0200 ++++ madwifi-ng-r2568-20070710/net80211/ieee80211_node.c 2007-07-23 01:48:46.590635219 +0200 @@ -1891,11 +1891,13 @@ /* From this point onwards we can no longer find the node, * so no more references are generated diff --git a/package/madwifi/patches/310-erp_beacon_check.patch b/package/madwifi/patches/310-erp_beacon_check.patch index 974f504..9a51683 100644 --- a/package/madwifi/patches/310-erp_beacon_check.patch +++ b/package/madwifi/patches/310-erp_beacon_check.patch @@ -1,7 +1,7 @@ Index: madwifi-ng-r2568-20070710/net80211/ieee80211_beacon.c =================================================================== ---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_beacon.c 2007-07-13 11:18:17.857314176 +0200 -+++ madwifi-ng-r2568-20070710/net80211/ieee80211_beacon.c 2007-07-13 11:18:21.897544413 +0200 +--- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_beacon.c 2007-07-23 01:48:42.278389477 +0200 ++++ madwifi-ng-r2568-20070710/net80211/ieee80211_beacon.c 2007-07-23 01:48:46.966656645 +0200 @@ -512,7 +512,7 @@ vap->iv_flags &= ~IEEE80211_F_XRUPDATE; } |