update madwifi to latest trunk - performance enhancements

SVN-Revision: 7341
2007-05-26 16:52:05 +00:00 · 2007-05-26 16:52:05 +00:00 · 272d51ddd3
parent 0016ac2005
commit 272d51ddd3
19 changed files with 306 additions and 307 deletions
--- a/package/madwifi/Makefile
+++ b/package/madwifi/Makefile
@ -10,14 +10,14 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk

 PKG_NAME:=madwifi
-PKG_VERSION:=r2362-20070522
+PKG_VERSION:=r2377-20070526
 PKG_BRANCH:=madwifi-ng
 PKG_RELEASE:=1

 PKG_SOURCE:=$(PKG_BRANCH)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://snapshots.madwifi.org/$(PKG_BRANCH)
-PKG_MD5SUM:=7a7783ecf6596089afc4aeebdffb397b
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_BRANCH)-$(PKG_VERSION)
+PKG_MD5SUM:=92f73015caa4584580fb0ec474783c7b

 include $(INCLUDE_DIR)/package.mk

--- a/package/madwifi/patches/100-kernel_cflags.patch
+++ b/package/madwifi/patches/100-kernel_cflags.patch
@ -1,6 +1,6 @@
-diff -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
--- madwifi-ng-refcount-r2313-20070505.old/hal/public/mips-be-elf.inc	2006-05-27 04:48:16.000000000 +0200
-+++ madwifi-ng-refcount-r2313-20070505.dev/hal/public/mips-be-elf.inc	2007-05-13 18:17:54.962213512 +0200
+diff -urN madwifi-ng-r2377-20070526.old/hal/public/mips-be-elf.inc madwifi-ng-r2377-20070526.dev/hal/public/mips-be-elf.inc
+--- madwifi-ng-r2377-20070526.old/hal/public/mips-be-elf.inc	2006-05-27 04:48:16.000000000 +0200
+++ madwifi-ng-r2377-20070526.dev/hal/public/mips-be-elf.inc	2007-05-26 18:51:08.033866208 +0200
@@ -71,5 +71,5 @@
 
 LDOPTS=	-EB
@ -8,9 +8,9 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/hal/public/mips-be-elf.inc madw
 -COPTS+=	-G 0 -EB -mno-abicalls -fno-pic -mips2 -Wa,--trap \
 +COPTS+=	-G 0 -mno-abicalls -fno-pic -mips32 -Wa,--trap \
 	-fno-strict-aliasing -fno-common -fomit-frame-pointer -mlong-calls
-diff -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
--- madwifi-ng-refcount-r2313-20070505.old/hal/public/mips-le-elf.inc	2006-05-27 04:48:16.000000000 +0200
-+++ madwifi-ng-refcount-r2313-20070505.dev/hal/public/mips-le-elf.inc	2007-05-13 18:17:54.963213360 +0200
+diff -urN madwifi-ng-r2377-20070526.old/hal/public/mips-le-elf.inc madwifi-ng-r2377-20070526.dev/hal/public/mips-le-elf.inc
+--- madwifi-ng-r2377-20070526.old/hal/public/mips-le-elf.inc	2006-05-27 04:48:16.000000000 +0200
+++ madwifi-ng-r2377-20070526.dev/hal/public/mips-le-elf.inc	2007-05-26 18:51:08.033866208 +0200
@@ -68,5 +68,5 @@
 
 LDOPTS=	-EL
@ -18,9 +18,9 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/hal/public/mips-le-elf.inc madw
 -COPTS+=	-G 0 -EL -mno-abicalls -fno-pic -mips2 -Wa,--trap \
 +COPTS+=	-G 0 -mno-abicalls -fno-pic -mips32 -Wa,--trap \
 	-fno-strict-aliasing -fno-common -fomit-frame-pointer -mlong-calls
-diff -ur madwifi.old/hal/public/xscale-be-elf.inc madwifi.dev/hal/public/xscale-be-elf.inc
--- madwifi.old/hal/public/xscale-be-elf.inc	2006-09-14 08:21:22.000000000 +0200
-+++ madwifi.dev/hal/public/xscale-be-elf.inc	2007-05-13 19:30:47.106546544 +0200
+diff -urN madwifi-ng-r2377-20070526.old/hal/public/xscale-be-elf.inc madwifi-ng-r2377-20070526.dev/hal/public/xscale-be-elf.inc
+--- madwifi-ng-r2377-20070526.old/hal/public/xscale-be-elf.inc	2006-09-14 08:21:22.000000000 +0200
+++ madwifi-ng-r2377-20070526.dev/hal/public/xscale-be-elf.inc	2007-05-26 18:51:08.034866056 +0200
@@ -77,5 +77,5 @@
 
 LDOPTS=	-EB
@ -28,9 +28,9 @@ diff -ur madwifi.old/hal/public/xscale-be-elf.inc madwifi.dev/hal/public/xscale-
 -COPTS+= -march=armv4 -mbig-endian -fno-strict-aliasing -fno-common -mapcs-32 \
 +COPTS+= -march=armv5te -mbig-endian -fno-strict-aliasing -fno-common  \
 	-mtune=xscale  -mshort-load-bytes
-diff -urN madwifi-ng-refcount-r2313-20070505.old/Makefile madwifi-ng-refcount-r2313-20070505.dev/Makefile
--- madwifi-ng-refcount-r2313-20070505.old/Makefile	2007-03-08 20:59:06.000000000 +0100
-+++ madwifi-ng-refcount-r2313-20070505.dev/Makefile	2007-05-13 18:17:54.963213360 +0200
+diff -urN madwifi-ng-r2377-20070526.old/Makefile madwifi-ng-r2377-20070526.dev/Makefile
+--- madwifi-ng-r2377-20070526.old/Makefile	2007-05-26 00:31:56.000000000 +0200
+++ madwifi-ng-r2377-20070526.dev/Makefile	2007-05-26 18:51:08.034866056 +0200
@@ -56,7 +56,7 @@
 
 all: modules tools
@ -40,4 +40,3 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/Makefile madwifi-ng-refcount-r2
 ifdef LINUX24
 	for i in $(DIRS_MODULES); do \
 		$(MAKE) -C $$i || exit 1; \
-
--- a/package/madwifi/patches/102-multicall_binary.patch
+++ b/package/madwifi/patches/102-multicall_binary.patch
@ -1,6 +1,6 @@
-diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/80211debug.c madwifi-ng-refcount-r2313-20070505.dev/tools/80211debug.c
--- madwifi-ng-refcount-r2313-20070505.old/tools/80211debug.c	2006-12-08 18:20:08.000000000 +0100
-+++ madwifi-ng-refcount-r2313-20070505.dev/tools/80211debug.c	2007-05-13 18:17:55.115190256 +0200
+diff -urN madwifi-ng-r2377-20070526.old/tools/80211debug.c madwifi-ng-r2377-20070526.dev/tools/80211debug.c
+--- madwifi-ng-r2377-20070526.old/tools/80211debug.c	2007-05-24 23:21:08.000000000 +0200
+++ madwifi-ng-r2377-20070526.dev/tools/80211debug.c	2007-05-26 18:51:08.119853136 +0200
@@ -49,6 +49,10 @@
 #include <getopt.h>
 #include <err.h>
@ -32,9 +32,9 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/80211debug.c madwifi-ng-r
 	const char *ifname = "ath0";
 	const char *cp, *tp;
 	const char *sep;
-diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/80211stats.c madwifi-ng-refcount-r2313-20070505.dev/tools/80211stats.c
--- madwifi-ng-refcount-r2313-20070505.old/tools/80211stats.c	2007-02-07 22:06:25.000000000 +0100
-+++ madwifi-ng-refcount-r2313-20070505.dev/tools/80211stats.c	2007-05-13 18:17:55.116190104 +0200
+diff -urN madwifi-ng-r2377-20070526.old/tools/80211stats.c madwifi-ng-r2377-20070526.dev/tools/80211stats.c
+--- madwifi-ng-r2377-20070526.old/tools/80211stats.c	2007-02-07 04:18:49.000000000 +0100
+++ madwifi-ng-r2377-20070526.dev/tools/80211stats.c	2007-05-26 18:51:08.119853136 +0200
@@ -60,6 +60,10 @@
 #include "net80211/ieee80211_crypto.h"
 #include "net80211/ieee80211_ioctl.h"
@ -66,9 +66,9 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/80211stats.c madwifi-ng-r
 	int c, len;
 	struct ieee80211req_sta_info *si;
 	u_int8_t buf[24*1024], *cp;
-diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/athchans.c madwifi-ng-refcount-r2313-20070505.dev/tools/athchans.c
--- madwifi-ng-refcount-r2313-20070505.old/tools/athchans.c	2007-02-07 22:06:25.000000000 +0100
-+++ madwifi-ng-refcount-r2313-20070505.dev/tools/athchans.c	2007-05-13 18:17:55.116190104 +0200
+diff -urN madwifi-ng-r2377-20070526.old/tools/athchans.c madwifi-ng-r2377-20070526.dev/tools/athchans.c
+--- madwifi-ng-r2377-20070526.old/tools/athchans.c	2007-02-07 04:18:49.000000000 +0100
+++ madwifi-ng-r2377-20070526.dev/tools/athchans.c	2007-05-26 18:51:08.119853136 +0200
@@ -59,6 +59,10 @@
 #include "net80211/ieee80211_crypto.h"
 #include "net80211/ieee80211_ioctl.h"
@ -101,9 +101,9 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/athchans.c madwifi-ng-ref
 	const char *ifname = "wifi0";
 	struct ieee80211req_chanlist chanlist;
 	int c;
-diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/athctrl.c madwifi-ng-refcount-r2313-20070505.dev/tools/athctrl.c
--- madwifi-ng-refcount-r2313-20070505.old/tools/athctrl.c	2006-02-03 13:03:03.000000000 +0100
-+++ madwifi-ng-refcount-r2313-20070505.dev/tools/athctrl.c	2007-05-13 18:17:55.117189952 +0200
+diff -urN madwifi-ng-r2377-20070526.old/tools/athctrl.c madwifi-ng-r2377-20070526.dev/tools/athctrl.c
+--- madwifi-ng-r2377-20070526.old/tools/athctrl.c	2006-02-03 13:03:03.000000000 +0100
+++ madwifi-ng-r2377-20070526.dev/tools/athctrl.c	2007-05-26 18:51:08.120852984 +0200
@@ -53,6 +53,10 @@
 
 #include <net/if.h>
@ -135,9 +135,9 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/athctrl.c madwifi-ng-refc
 	char device[IFNAMSIZ + 1];
 	int distance = -1;
 	int c;
-diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/athdebug.c madwifi-ng-refcount-r2313-20070505.dev/tools/athdebug.c
--- madwifi-ng-refcount-r2313-20070505.old/tools/athdebug.c	2006-12-08 18:20:08.000000000 +0100
-+++ madwifi-ng-refcount-r2313-20070505.dev/tools/athdebug.c	2007-05-13 18:17:55.117189952 +0200
+diff -urN madwifi-ng-r2377-20070526.old/tools/athdebug.c madwifi-ng-r2377-20070526.dev/tools/athdebug.c
+--- madwifi-ng-r2377-20070526.old/tools/athdebug.c	2007-05-24 23:21:08.000000000 +0200
+++ madwifi-ng-r2377-20070526.dev/tools/athdebug.c	2007-05-26 18:51:08.120852984 +0200
@@ -52,6 +52,10 @@
 #include <getopt.h>
 #include <err.h>
@ -170,9 +170,9 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/athdebug.c madwifi-ng-ref
 #ifdef __linux__
 	const char *ifname = "wifi0";
 #else
-diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/athkey.c madwifi-ng-refcount-r2313-20070505.dev/tools/athkey.c
--- madwifi-ng-refcount-r2313-20070505.old/tools/athkey.c	2007-02-07 22:06:25.000000000 +0100
-+++ madwifi-ng-refcount-r2313-20070505.dev/tools/athkey.c	2007-05-13 18:17:55.117189952 +0200
+diff -urN madwifi-ng-r2377-20070526.old/tools/athkey.c madwifi-ng-r2377-20070526.dev/tools/athkey.c
+--- madwifi-ng-r2377-20070526.old/tools/athkey.c	2007-02-07 04:18:49.000000000 +0100
+++ madwifi-ng-r2377-20070526.dev/tools/athkey.c	2007-05-26 18:51:08.121852832 +0200
@@ -59,6 +59,10 @@
 #include "net80211/ieee80211_crypto.h"
 #include "net80211/ieee80211_ioctl.h"
@ -204,9 +204,9 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/athkey.c madwifi-ng-refco
 	const char *ifname = "wifi0";
 	struct ieee80211req_key setkey;
 	struct ieee80211req_del_key delkey;
-diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/athstats.c madwifi-ng-refcount-r2313-20070505.dev/tools/athstats.c
--- madwifi-ng-refcount-r2313-20070505.old/tools/athstats.c	2007-04-04 23:25:20.000000000 +0200
-+++ madwifi-ng-refcount-r2313-20070505.dev/tools/athstats.c	2007-05-13 18:17:55.118189800 +0200
+diff -urN madwifi-ng-r2377-20070526.old/tools/athstats.c madwifi-ng-r2377-20070526.dev/tools/athstats.c
+--- madwifi-ng-r2377-20070526.old/tools/athstats.c	2007-03-27 03:45:42.000000000 +0200
+++ madwifi-ng-r2377-20070526.dev/tools/athstats.c	2007-05-26 18:51:08.121852832 +0200
@@ -63,6 +63,10 @@
 #include "wireless_copy.h"
 #include "if_athioctl.h"
@ -239,9 +239,9 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/athstats.c madwifi-ng-ref
 #ifdef __linux__
 	const char *ifname = "wifi0";
 #else
-diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/do_multi.c madwifi-ng-refcount-r2313-20070505.dev/tools/do_multi.c
--- madwifi-ng-refcount-r2313-20070505.old/tools/do_multi.c	1970-01-01 01:00:00.000000000 +0100
-+++ madwifi-ng-refcount-r2313-20070505.dev/tools/do_multi.c	2007-05-13 18:17:55.118189800 +0200
+diff -urN madwifi-ng-r2377-20070526.old/tools/do_multi.c madwifi-ng-r2377-20070526.dev/tools/do_multi.c
+--- madwifi-ng-r2377-20070526.old/tools/do_multi.c	1970-01-01 01:00:00.000000000 +0100
+++ madwifi-ng-r2377-20070526.dev/tools/do_multi.c	2007-05-26 18:51:08.121852832 +0200
@@ -0,0 +1,30 @@
 +#include <string.h>
 +#include "do_multi.h"
@ -273,9 +273,9 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/do_multi.c madwifi-ng-ref
 +    
 +    return ret;
 +}
-diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/do_multi.h madwifi-ng-refcount-r2313-20070505.dev/tools/do_multi.h
--- madwifi-ng-refcount-r2313-20070505.old/tools/do_multi.h	1970-01-01 01:00:00.000000000 +0100
-+++ madwifi-ng-refcount-r2313-20070505.dev/tools/do_multi.h	2007-05-13 18:17:55.118189800 +0200
+diff -urN madwifi-ng-r2377-20070526.old/tools/do_multi.h madwifi-ng-r2377-20070526.dev/tools/do_multi.h
+--- madwifi-ng-r2377-20070526.old/tools/do_multi.h	1970-01-01 01:00:00.000000000 +0100
+++ madwifi-ng-r2377-20070526.dev/tools/do_multi.h	2007-05-26 18:51:08.122852680 +0200
@@ -0,0 +1,9 @@
 +
 +int a80211debug_init(int argc, char *argv[]);
@ -286,9 +286,9 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/do_multi.h madwifi-ng-ref
 +int athkey_init(int argc, char *argv[]);
 +int athstats_init(int argc, char *argv[]);
 +int wlanconfig_init(int argc, char *argv[]);
-diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/Makefile madwifi-ng-refcount-r2313-20070505.dev/tools/Makefile
--- madwifi-ng-refcount-r2313-20070505.old/tools/Makefile	2007-04-04 23:25:20.000000000 +0200
-+++ madwifi-ng-refcount-r2313-20070505.dev/tools/Makefile	2007-05-13 18:17:55.119189648 +0200
+diff -urN madwifi-ng-r2377-20070526.old/tools/Makefile madwifi-ng-r2377-20070526.dev/tools/Makefile
+--- madwifi-ng-r2377-20070526.old/tools/Makefile	2007-03-27 03:45:42.000000000 +0200
+++ madwifi-ng-r2377-20070526.dev/tools/Makefile	2007-05-26 18:51:08.122852680 +0200
@@ -49,6 +49,12 @@
 
 ALL=	athstats 80211stats athkey athchans athctrl \
@ -333,9 +333,9 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/Makefile madwifi-ng-refco
 athstats: athstats.c
 	$(CC) -o athstats $(ALL_CFLAGS) -I$(TOP)/ath $(LDFLAGS) athstats.c
 80211stats: 80211stats.c
-diff -urN madwifi-ng-refcount-r2313-20070505.old/tools/wlanconfig.c madwifi-ng-refcount-r2313-20070505.dev/tools/wlanconfig.c
--- madwifi-ng-refcount-r2313-20070505.old/tools/wlanconfig.c	2007-05-04 02:10:06.000000000 +0200
-+++ madwifi-ng-refcount-r2313-20070505.dev/tools/wlanconfig.c	2007-05-13 18:17:55.119189648 +0200
+diff -urN madwifi-ng-r2377-20070526.old/tools/wlanconfig.c madwifi-ng-r2377-20070526.dev/tools/wlanconfig.c
+--- madwifi-ng-r2377-20070526.old/tools/wlanconfig.c	2007-04-29 19:35:25.000000000 +0200
+++ madwifi-ng-r2377-20070526.dev/tools/wlanconfig.c	2007-05-26 18:51:08.123852528 +0200
@@ -62,6 +62,10 @@
 #include "net80211/ieee80211_crypto.h"
 #include "net80211/ieee80211_ioctl.h"
--- a/package/madwifi/patches/103-disable_rfkill.patch
+++ b/package/madwifi/patches/103-disable_rfkill.patch
@ -1,12 +1,12 @@
-diff -urN madwifi-ng-refcount-r2313-20070505.old/ath/if_ath.c madwifi-ng-refcount-r2313-20070505.dev/ath/if_ath.c
--- madwifi-ng-refcount-r2313-20070505.old/ath/if_ath.c	2007-05-04 23:09:29.000000000 +0200
-+++ madwifi-ng-refcount-r2313-20070505.dev/ath/if_ath.c	2007-05-13 18:17:55.201177184 +0200
-@@ -260,7 +260,7 @@
+diff -urN madwifi-ng-r2377-20070526.old/ath/if_ath.c madwifi-ng-r2377-20070526.dev/ath/if_ath.c
+--- madwifi-ng-r2377-20070526.old/ath/if_ath.c	2007-05-25 22:03:27.000000000 +0200
+++ madwifi-ng-r2377-20070526.dev/ath/if_ath.c	2007-05-26 18:51:08.212839000 +0200
+@@ -257,7 +257,7 @@
 static int ath_xchanmode = AH_TRUE;		/* enable extended channels */
 static char *autocreate = NULL;
 static char *ratectl = DEF_RATE_CTL;
 -static int rfkill = -1;
 +static int rfkill = 0;
- static int countrycode = -1;
- static int outdoor = -1;
- static int xchanmode = -1;
+ #ifdef ATH_CAP_TPC
+ static int tpc = -1;
+ #endif
--- a/package/madwifi/patches/104-autocreate_none.patch
+++ b/package/madwifi/patches/104-autocreate_none.patch
@ -1,7 +1,7 @@
-diff -urN madwifi-ng-refcount-r2313-20070505.old/ath/if_ath.c madwifi-ng-refcount-r2313-20070505.dev/ath/if_ath.c
--- madwifi-ng-refcount-r2313-20070505.old/ath/if_ath.c	2007-05-13 18:17:55.278165480 +0200
-+++ madwifi-ng-refcount-r2313-20070505.dev/ath/if_ath.c	2007-05-13 18:17:55.287164112 +0200
-@@ -401,7 +401,7 @@
+diff -urN madwifi-ng-r2377-20070526.old/ath/if_ath.c madwifi-ng-r2377-20070526.dev/ath/if_ath.c
+--- madwifi-ng-r2377-20070526.old/ath/if_ath.c	2007-05-26 18:51:08.298825928 +0200
+++ madwifi-ng-r2377-20070526.dev/ath/if_ath.c	2007-05-26 18:51:08.306824712 +0200
+@@ -410,7 +410,7 @@
 	HAL_STATUS status;
 	int error = 0;
 	unsigned int i;
--- a/package/madwifi/patches/105-ratectl_attach.patch
+++ b/package/madwifi/patches/105-ratectl_attach.patch
@ -1,6 +1,6 @@
-diff -urN madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_rate.c madwifi-ng-refcount-r2313-20070505.dev/net80211/ieee80211_rate.c
--- madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_rate.c	2007-04-04 23:25:20.000000000 +0200
-+++ madwifi-ng-refcount-r2313-20070505.dev/net80211/ieee80211_rate.c	2007-05-13 18:17:55.368151800 +0200
+diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_rate.c madwifi-ng-r2377-20070526.dev/net80211/ieee80211_rate.c
+--- madwifi-ng-r2377-20070526.old/net80211/ieee80211_rate.c	2007-03-28 09:07:07.000000000 +0200
+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_rate.c	2007-05-26 18:51:08.398810728 +0200
@@ -100,8 +100,18 @@
 		ieee80211_load_module(buf);
 
--- a/package/madwifi/patches/110-init_fix_PR_914.patch
+++ b/package/madwifi/patches/110-init_fix_PR_914.patch
@ -1,7 +1,7 @@
-diff -urN madwifi-ng-refcount-r2313-20070505.old/ath/if_ath.c madwifi-ng-refcount-r2313-20070505.dev/ath/if_ath.c
--- madwifi-ng-refcount-r2313-20070505.old/ath/if_ath.c	2007-05-13 18:17:55.362152712 +0200
-+++ madwifi-ng-refcount-r2313-20070505.dev/ath/if_ath.c	2007-05-13 18:17:55.614114408 +0200
-@@ -2003,7 +2003,10 @@
+diff -urN madwifi-ng-r2377-20070526.old/ath/if_ath.c madwifi-ng-r2377-20070526.dev/ath/if_ath.c
+--- madwifi-ng-r2377-20070526.old/ath/if_ath.c	2007-05-26 18:51:08.393811488 +0200
+++ madwifi-ng-r2377-20070526.dev/ath/if_ath.c	2007-05-26 18:51:08.485797504 +0200
+@@ -1959,7 +1959,10 @@
 		ath_draintxq(sc);
 		if (!sc->sc_invalid) {
 			ath_stoprecv(sc);
--- a/package/madwifi/patches/111-minstrel_crash.patch
+++ b/package/madwifi/patches/111-minstrel_crash.patch
@ -1,6 +1,6 @@
-diff -ur madwifi.old/ath_rate/minstrel/minstrel.c madwifi.dev/ath_rate/minstrel/minstrel.c
--- madwifi.old/ath_rate/minstrel/minstrel.c	2007-05-18 13:19:16.000000000 +0200
-+++ madwifi.dev/ath_rate/minstrel/minstrel.c	2007-05-21 09:38:03.102725008 +0200
+diff -urN madwifi-ng-r2377-20070526.old/ath_rate/minstrel/minstrel.c madwifi-ng-r2377-20070526.dev/ath_rate/minstrel/minstrel.c
+--- madwifi-ng-r2377-20070526.old/ath_rate/minstrel/minstrel.c	2007-05-21 19:33:26.000000000 +0200
+++ madwifi-ng-r2377-20070526.dev/ath_rate/minstrel/minstrel.c	2007-05-26 18:51:08.575783824 +0200
@@ -388,6 +388,9 @@
 	int rc1, rc2, rc3;         /* Index into the rate table, so for example, it is  0..11 */
 	int rixc1, rixc2, rixc3;   /* The actual bit rate used */
--- a/package/madwifi/patches/112-keycache_PR_962.patch
+++ b/package/madwifi/patches/112-keycache_PR_962.patch
@ -1,7 +1,7 @@
-diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
--- madwifi.old/ath/if_ath.c	2007-05-21 07:33:42.392925296 +0200
-+++ madwifi.dev/ath/if_ath.c	2007-05-21 07:35:51.933232176 +0200
-@@ -5660,7 +5660,8 @@
+diff -urN madwifi-ng-r2377-20070526.old/ath/if_ath.c madwifi-ng-r2377-20070526.dev/ath/if_ath.c
+--- madwifi-ng-r2377-20070526.old/ath/if_ath.c	2007-05-26 18:51:08.569784736 +0200
+++ madwifi-ng-r2377-20070526.dev/ath/if_ath.c	2007-05-26 18:51:08.661770752 +0200
+@@ -5672,7 +5672,8 @@
 		 * frame; it'll be dropped where it's not wanted.
 		 */
 		if (rs->rs_keyix != HAL_RXKEYIX_INVALID &&
@ -11,10 +11,10 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 			struct ath_node *an;
 			/*
 			 * Fast path: node is present in the key map;
-diff -ur madwifi.old/net80211/ieee80211_node.c madwifi.dev/net80211/ieee80211_node.c
--- madwifi.old/net80211/ieee80211_node.c	2007-05-21 07:33:42.371928488 +0200
-+++ madwifi.dev/net80211/ieee80211_node.c	2007-05-21 07:34:13.689167544 +0200
-@@ -1272,8 +1272,6 @@
+diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_node.c madwifi-ng-r2377-20070526.dev/net80211/ieee80211_node.c
+--- madwifi-ng-r2377-20070526.old/net80211/ieee80211_node.c	2007-05-21 17:53:39.000000000 +0200
+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_node.c	2007-05-26 18:51:08.663770448 +0200
+@@ -1269,8 +1269,6 @@
 	IEEE80211_NODE_TABLE_UNLOCK_IRQ(nt);
 
 	return ni;
@ -23,7 +23,7 @@ diff -ur madwifi.old/net80211/ieee80211_node.c madwifi.dev/net80211/ieee80211_no
 }
 #ifdef IEEE80211_DEBUG_REFCNT
 EXPORT_SYMBOL(ieee80211_find_rxnode_debug);
-@@ -1281,6 +1279,20 @@
+@@ -1278,6 +1276,20 @@
 EXPORT_SYMBOL(ieee80211_find_rxnode);
 #endif
 
@ -44,10 +44,10 @@ diff -ur madwifi.old/net80211/ieee80211_node.c madwifi.dev/net80211/ieee80211_no
 /*
  * Return a reference to the appropriate node for sending
  * a data frame.  This handles node discovery in adhoc networks.
-diff -ur madwifi.old/net80211/ieee80211_node.h madwifi.dev/net80211/ieee80211_node.h
--- madwifi.old/net80211/ieee80211_node.h	2007-05-21 07:33:42.372928336 +0200
-+++ madwifi.dev/net80211/ieee80211_node.h	2007-05-21 07:34:13.689167544 +0200
-@@ -317,6 +317,8 @@
+diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_node.h madwifi-ng-r2377-20070526.dev/net80211/ieee80211_node.h
+--- madwifi-ng-r2377-20070526.old/net80211/ieee80211_node.h	2007-05-21 17:53:39.000000000 +0200
+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_node.h	2007-05-26 18:51:08.664770296 +0200
+@@ -323,6 +323,8 @@
 	*pni = NULL;			/* guard against use */
 }
 
--- a/package/madwifi/patches/113-no_ibss_pwrsave.patch
+++ b/package/madwifi/patches/113-no_ibss_pwrsave.patch
@ -1,6 +1,6 @@
-diff -urN madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_scan.c madwifi-ng-refcount-r2313-20070505.dev/net80211/ieee80211_scan.c
--- madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_scan.c	2007-04-25 22:29:55.000000000 +0200
-+++ madwifi-ng-refcount-r2313-20070505.dev/net80211/ieee80211_scan.c	2007-05-13 18:17:55.868075800 +0200
+diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_scan.c madwifi-ng-r2377-20070526.dev/net80211/ieee80211_scan.c
+--- madwifi-ng-r2377-20070526.old/net80211/ieee80211_scan.c	2007-05-17 03:01:29.000000000 +0200
+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_scan.c	2007-05-26 18:51:08.754756616 +0200
@@ -291,7 +291,8 @@
 	struct ieee80211com *ic = vap->iv_ic;
 	int delay;
--- a/package/madwifi/patches/116-adhoc_beacon_PR_1033.patch
+++ b/package/madwifi/patches/116-adhoc_beacon_PR_1033.patch
@ -1,7 +1,7 @@
-diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
--- madwifi.old/ath/if_ath.c	2007-05-21 07:33:42.392925296 +0200
-+++ madwifi.dev/ath/if_ath.c	2007-05-21 07:39:50.536958896 +0200
-@@ -4359,16 +4359,31 @@
+diff -urN madwifi-ng-r2377-20070526.old/ath/if_ath.c madwifi-ng-r2377-20070526.dev/ath/if_ath.c
+--- madwifi-ng-r2377-20070526.old/ath/if_ath.c	2007-05-26 18:51:08.747757680 +0200
+++ madwifi-ng-r2377-20070526.dev/ath/if_ath.c	2007-05-26 18:51:08.841743392 +0200
+@@ -4373,16 +4373,31 @@
 	struct ieee80211com *ic = &sc->sc_ic;
 	struct ath_hal *ah = sc->sc_ah;
 	struct ieee80211_node *ni;
@ -37,7 +37,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 	/* XXX conditionalize multi-bss support? */
 	if (ic->ic_opmode == IEEE80211_M_HOSTAP) {
 		/*
-@@ -4382,20 +4397,61 @@
+@@ -4396,20 +4411,61 @@
 		if (sc->sc_stagbeacons)
 			intval /= ATH_BCBUF;	/* for staggered beacons */
 		if ((sc->sc_nostabeacons) &&
@ -108,7 +108,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 		int dtimperiod, dtimcount;
 		int cfpperiod, cfpcount;
 
-@@ -4411,13 +4467,13 @@
+@@ -4425,13 +4481,13 @@
 			dtimcount = 0;		/* XXX? */
 		cfpperiod = 1;			/* NB: no PCF support yet */
 		cfpcount = 0;
@ -125,7 +125,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 		do {
 			nexttbtt += intval;
 			if (--dtimcount < 0) {
-@@ -4425,7 +4481,7 @@
+@@ -4439,7 +4495,7 @@
 				if (--cfpcount < 0)
 					cfpcount = cfpperiod - 1;
 			}
@ -134,7 +134,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 #undef FUDGE
 		memset(&bs, 0, sizeof(bs));
 		bs.bs_intval = intval;
-@@ -4477,7 +4533,7 @@
+@@ -4491,7 +4547,7 @@
 		DPRINTF(sc, ATH_DEBUG_BEACON, 
 			"%s: tsf %llu tsf:tu %u intval %u nexttbtt %u dtim %u nextdtim %u bmiss %u sleep %u cfp:period %u maxdur %u next %u timoffset %u\n",
 			__func__,
@ -143,7 +143,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 			bs.bs_intval,
 			bs.bs_nexttbtt,
 			bs.bs_dtimperiod,
-@@ -4496,7 +4552,7 @@
+@@ -4510,7 +4566,7 @@
 		ath_hal_intrset(ah, sc->sc_imask);
 	} else {
 		ath_hal_intrset(ah, 0);
@ -152,7 +152,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 			intval |= HAL_BEACON_RESET_TSF;
 		if (ic->ic_opmode == IEEE80211_M_IBSS) {
 			/*
-@@ -4533,8 +4589,40 @@
+@@ -4547,8 +4603,40 @@
 		if (ic->ic_opmode == IEEE80211_M_IBSS && sc->sc_hasveol)
 			ath_beacon_start_adhoc(sc, vap);
 	}
--- a/package/madwifi/patches/118-txstop_workaround.patch
+++ b/package/madwifi/patches/118-txstop_workaround.patch
@ -1,7 +1,7 @@
-diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
--- madwifi.old/ath/if_ath.c	2007-05-21 07:45:03.185429104 +0200
-+++ madwifi.dev/ath/if_ath.c	2007-05-21 07:45:55.867420224 +0200
-@@ -2206,6 +2206,17 @@
+diff -urN madwifi-ng-r2377-20070526.old/ath/if_ath.c madwifi-ng-r2377-20070526.dev/ath/if_ath.c
+--- madwifi-ng-r2377-20070526.old/ath/if_ath.c	2007-05-26 18:51:08.924730776 +0200
+++ madwifi-ng-r2377-20070526.dev/ath/if_ath.c	2007-05-26 18:51:08.933729408 +0200
+@@ -2220,6 +2220,17 @@
 		txq->axq_link = &lastds->ds_link;
 		ath_hal_txstart(ah, txq->axq_qnum);
 		sc->sc_dev->trans_start = jiffies;
@ -19,7 +19,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 	}
 	ATH_TXQ_UNLOCK(txq);
 
-@@ -7246,6 +7257,7 @@
+@@ -7262,6 +7273,7 @@
 			__func__, ds);
 #else
 		ds = bf->bf_desc;		/* NB: last descriptor */
@ -27,13 +27,13 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 #endif
 		ts = &bf->bf_dsstatus.ds_txstat;
 		status = ath_hal_txprocdesc(ah, ds, ts);
-diff -ur madwifi.old/ath/if_athvar.h madwifi.dev/ath/if_athvar.h
--- madwifi.old/ath/if_athvar.h	2007-05-18 13:19:16.000000000 +0200
-+++ madwifi.dev/ath/if_athvar.h	2007-05-21 07:45:37.720179024 +0200
-@@ -684,6 +684,14 @@
- #endif
+diff -urN madwifi-ng-r2377-20070526.old/ath/if_athvar.h madwifi-ng-r2377-20070526.dev/ath/if_athvar.h
+--- madwifi-ng-r2377-20070526.old/ath/if_athvar.h	2007-05-25 04:38:02.000000000 +0200
+++ madwifi-ng-r2377-20070526.dev/ath/if_athvar.h	2007-05-26 18:51:08.933729408 +0200
+@@ -685,6 +685,14 @@
 	u_int sc_slottimeconf;			/* manual override for slottime */
 	int16_t sc_channoise; 			/* Measured noise of current channel (dBm) */
+ 	u_int64_t sc_tsf;			/* TSF at last rx interrupt */
 +
 +	/* 
 +	 * Several MiniPCI cards and most SoC revs frequently cease all transmission
--- a/package/madwifi/patches/119-secfix_PR_1335.patch
+++ b/package/madwifi/patches/119-secfix_PR_1335.patch
@ -1,6 +1,6 @@
-diff -ur madwifi.old/net80211/ieee80211_input.c madwifi.dev/net80211/ieee80211_input.c
--- madwifi.old/net80211/ieee80211_input.c	2007-05-21 17:53:39.000000000 +0200
-+++ madwifi.dev/net80211/ieee80211_input.c	2007-05-23 16:50:21.097957392 +0200
+diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_input.c madwifi-ng-r2377-20070526.dev/net80211/ieee80211_input.c
+--- madwifi-ng-r2377-20070526.old/net80211/ieee80211_input.c	2007-05-21 17:53:39.000000000 +0200
+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_input.c	2007-05-26 18:51:09.027715120 +0200
@@ -695,13 +695,31 @@
 
 			/* NB: assumes linear (i.e., non-fragmented) skb */
--- a/package/madwifi/patches/120-soc_fix.patch
+++ b/package/madwifi/patches/120-soc_fix.patch
@ -1,6 +1,6 @@
-diff -urN madwifi-ng-refcount-r2313-20070505.old/ath/if_ath_ahb.c madwifi-ng-refcount-r2313-20070505.dev/ath/if_ath_ahb.c
--- madwifi-ng-refcount-r2313-20070505.old/ath/if_ath_ahb.c	2007-03-08 20:59:06.000000000 +0100
-+++ madwifi-ng-refcount-r2313-20070505.dev/ath/if_ath_ahb.c	2007-05-13 18:17:56.367999800 +0200
+diff -urN madwifi-ng-r2377-20070526.old/ath/if_ath_ahb.c madwifi-ng-r2377-20070526.dev/ath/if_ath_ahb.c
+--- madwifi-ng-r2377-20070526.old/ath/if_ath_ahb.c	2007-02-24 02:33:54.000000000 +0100
+++ madwifi-ng-r2377-20070526.dev/ath/if_ath_ahb.c	2007-05-26 18:51:09.112702200 +0200
@@ -274,12 +274,12 @@
 }
 
@ -68,10 +68,10 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/ath/if_ath_ahb.c madwifi-ng-ref
 			return ret;
 		break;
 	default:
-diff -urN madwifi-ng-refcount-r2313-20070505.old/ath/if_ath.c madwifi-ng-refcount-r2313-20070505.dev/ath/if_ath.c
--- madwifi-ng-refcount-r2313-20070505.old/ath/if_ath.c	2007-05-13 18:17:56.362000712 +0200
-+++ madwifi-ng-refcount-r2313-20070505.dev/ath/if_ath.c	2007-05-13 18:17:56.371999192 +0200
-@@ -7670,9 +7672,24 @@
+diff -urN madwifi-ng-r2377-20070526.old/ath/if_ath.c madwifi-ng-r2377-20070526.dev/ath/if_ath.c
+--- madwifi-ng-r2377-20070526.old/ath/if_ath.c	2007-05-26 18:51:09.019716336 +0200
+++ madwifi-ng-r2377-20070526.dev/ath/if_ath.c	2007-05-26 18:51:09.116701592 +0200
+@@ -7636,9 +7636,24 @@
 		DPRINTF(sc, ATH_DEBUG_RESET, "%s: beacon queue 0x%x\n",
 			__func__, ath_hal_gettxbuf(ah, sc->sc_bhalq));
 		for (i = 0; i < HAL_NUM_TX_QUEUES; i++)
@ -83,7 +83,7 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/ath/if_ath.c madwifi-ng-refcoun
 +				 * Double check the hal tx pending count */
 +				npend += ath_hal_numtxpending(ah, sc->sc_txq[i].axq_qnum);
 +			}
-+	}
+ 	}
 +	
 +	if (npend) {
 +		HAL_STATUS status;
@ -92,7 +92,7 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/ath/if_ath.c madwifi-ng-refcoun
 +		DPRINTF(sc, ATH_DEBUG_RESET, "%s: Unable to stop TxDMA. Reset HAL!\n", __func__);
 +		if (!ath_hal_reset(ah, sc->sc_ic.ic_opmode, &sc->sc_curchan, AH_TRUE, &status))
 +			printk("%s: unable to reset hardware; hal status %u\n", __func__, status);
- 	}
+	}
 +
 	sc->sc_dev->trans_start = jiffies;
 	netif_start_queue(sc->sc_dev);		/* XXX move to callers */
--- a/package/madwifi/patches/200-no_debug.patch
+++ b/package/madwifi/patches/200-no_debug.patch
@ -1,6 +1,6 @@
-diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
--- madwifi.old/ath/if_ath.c	2007-05-23 16:46:50.748935304 +0200
-+++ madwifi.dev/ath/if_ath.c	2007-05-23 16:47:03.275031048 +0200
+diff -urN madwifi-ng-r2377-20070526.old/ath/if_ath.c madwifi-ng-r2377-20070526.dev/ath/if_ath.c
+--- madwifi-ng-r2377-20070526.old/ath/if_ath.c	2007-05-26 18:51:09.199688976 +0200
+++ madwifi-ng-r2377-20070526.dev/ath/if_ath.c	2007-05-26 18:51:09.207687760 +0200
@@ -75,7 +75,7 @@
 #include <net80211/if_llc.h>
 #endif
@ -10,7 +10,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 
 #include "net80211/if_athproto.h"
 #include "if_athvar.h"
-@@ -356,7 +356,7 @@
+@@ -368,7 +368,7 @@
 		ath_keyprint(sc, __func__, ix, hk, mac);	\
 } while (0)
 #else /* defined(AR_DEBUG) */
@ -19,9 +19,9 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 #define	DPRINTF(sc, _m, _fmt, ...)
 #define	KEYPRINTF(sc, k, ix, mac)
 #endif /* defined(AR_DEBUG) */
-diff -ur madwifi.old/ath_rate/amrr/amrr.c madwifi.dev/ath_rate/amrr/amrr.c
--- madwifi.old/ath_rate/amrr/amrr.c	2007-05-21 19:33:26.000000000 +0200
-+++ madwifi.dev/ath_rate/amrr/amrr.c	2007-05-23 16:47:03.276030896 +0200
+diff -urN madwifi-ng-r2377-20070526.old/ath_rate/amrr/amrr.c madwifi-ng-r2377-20070526.dev/ath_rate/amrr/amrr.c
+--- madwifi-ng-r2377-20070526.old/ath_rate/amrr/amrr.c	2007-05-21 19:33:26.000000000 +0200
+++ madwifi-ng-r2377-20070526.dev/ath_rate/amrr/amrr.c	2007-05-26 18:51:09.208687608 +0200
@@ -69,7 +69,7 @@
 
 #include "amrr.h"
@ -31,9 +31,9 @@ diff -ur madwifi.old/ath_rate/amrr/amrr.c madwifi.dev/ath_rate/amrr/amrr.c
 #ifdef AMRR_DEBUG
 #define	DPRINTF(sc, _fmt, ...) do {					\
 	if (sc->sc_debug & 0x10)					\
-diff -ur madwifi.old/ath_rate/minstrel/minstrel.c madwifi.dev/ath_rate/minstrel/minstrel.c
--- madwifi.old/ath_rate/minstrel/minstrel.c	2007-05-23 16:46:50.731937888 +0200
-+++ madwifi.dev/ath_rate/minstrel/minstrel.c	2007-05-23 16:47:03.276030896 +0200
+diff -urN madwifi-ng-r2377-20070526.old/ath_rate/minstrel/minstrel.c madwifi-ng-r2377-20070526.dev/ath_rate/minstrel/minstrel.c
+--- madwifi-ng-r2377-20070526.old/ath_rate/minstrel/minstrel.c	2007-05-26 18:51:08.653771968 +0200
+++ madwifi-ng-r2377-20070526.dev/ath_rate/minstrel/minstrel.c	2007-05-26 18:51:09.208687608 +0200
@@ -116,7 +116,7 @@
 
 #include "minstrel.h"
@ -43,9 +43,9 @@ diff -ur madwifi.old/ath_rate/minstrel/minstrel.c madwifi.dev/ath_rate/minstrel/
 #ifdef MINSTREL_DEBUG
 enum {
 	ATH_DEBUG_RATE		= 0x00000010	/* rate control */
-diff -ur madwifi.old/ath_rate/onoe/onoe.c madwifi.dev/ath_rate/onoe/onoe.c
--- madwifi.old/ath_rate/onoe/onoe.c	2007-05-21 19:33:26.000000000 +0200
-+++ madwifi.dev/ath_rate/onoe/onoe.c	2007-05-23 16:47:03.312025424 +0200
+diff -urN madwifi-ng-r2377-20070526.old/ath_rate/onoe/onoe.c madwifi-ng-r2377-20070526.dev/ath_rate/onoe/onoe.c
+--- madwifi-ng-r2377-20070526.old/ath_rate/onoe/onoe.c	2007-05-21 19:33:26.000000000 +0200
+++ madwifi-ng-r2377-20070526.dev/ath_rate/onoe/onoe.c	2007-05-26 18:51:09.209687456 +0200
@@ -65,7 +65,7 @@
 
 #include "onoe.h"
@ -55,9 +55,9 @@ diff -ur madwifi.old/ath_rate/onoe/onoe.c madwifi.dev/ath_rate/onoe/onoe.c
 #ifdef ONOE_DEBUG
 enum {
 	ATH_DEBUG_RATE	= 0x00000010,	/* rate control */
-diff -ur madwifi.old/ath_rate/sample/sample.c madwifi.dev/ath_rate/sample/sample.c
--- madwifi.old/ath_rate/sample/sample.c	2007-05-21 19:33:26.000000000 +0200
-+++ madwifi.dev/ath_rate/sample/sample.c	2007-05-23 16:47:03.346020256 +0200
+diff -urN madwifi-ng-r2377-20070526.old/ath_rate/sample/sample.c madwifi-ng-r2377-20070526.dev/ath_rate/sample/sample.c
+--- madwifi-ng-r2377-20070526.old/ath_rate/sample/sample.c	2007-05-21 19:33:26.000000000 +0200
+++ madwifi-ng-r2377-20070526.dev/ath_rate/sample/sample.c	2007-05-26 18:51:09.209687456 +0200
@@ -67,7 +67,7 @@
 
 #include "sample.h"
@ -67,9 +67,9 @@ diff -ur madwifi.old/ath_rate/sample/sample.c madwifi.dev/ath_rate/sample/sample
 #ifdef SAMPLE_DEBUG
 enum {
 	ATH_DEBUG_NODE		= 0x00080000,	/* node management */
-diff -ur madwifi.old/net80211/ieee80211_proto.c madwifi.dev/net80211/ieee80211_proto.c
--- madwifi.old/net80211/ieee80211_proto.c	2007-05-21 17:53:39.000000000 +0200
-+++ madwifi.dev/net80211/ieee80211_proto.c	2007-05-23 16:47:03.347020104 +0200
+diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_proto.c madwifi-ng-r2377-20070526.dev/net80211/ieee80211_proto.c
+--- madwifi-ng-r2377-20070526.old/net80211/ieee80211_proto.c	2007-05-21 17:53:39.000000000 +0200
+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_proto.c	2007-05-26 18:51:09.210687304 +0200
@@ -312,6 +312,7 @@
 }
 EXPORT_SYMBOL(ieee80211_print_essid);
@ -86,9 +86,9 @@ diff -ur madwifi.old/net80211/ieee80211_proto.c madwifi.dev/net80211/ieee80211_p
 
 int
 ieee80211_fix_rate(struct ieee80211_node *ni, int flags)
-diff -ur madwifi.old/net80211/ieee80211_proto.h madwifi.dev/net80211/ieee80211_proto.h
--- madwifi.old/net80211/ieee80211_proto.h	2007-01-30 05:01:29.000000000 +0100
-+++ madwifi.dev/net80211/ieee80211_proto.h	2007-05-23 16:47:03.347020104 +0200
+diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_proto.h madwifi-ng-r2377-20070526.dev/net80211/ieee80211_proto.h
+--- madwifi-ng-r2377-20070526.old/net80211/ieee80211_proto.h	2007-01-30 05:01:29.000000000 +0100
+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_proto.h	2007-05-26 18:51:09.211687152 +0200
@@ -247,7 +247,11 @@
 #endif
 int ieee80211_new_state(struct ieee80211vap *, enum ieee80211_state, int);
@ -101,9 +101,9 @@ diff -ur madwifi.old/net80211/ieee80211_proto.h madwifi.dev/net80211/ieee80211_p
 struct sk_buff *ieee80211_getcfframe(struct ieee80211vap *, int);
 
 /*
-diff -ur madwifi.old/net80211/ieee80211_var.h madwifi.dev/net80211/ieee80211_var.h
--- madwifi.old/net80211/ieee80211_var.h	2007-05-21 19:33:26.000000000 +0200
-+++ madwifi.dev/net80211/ieee80211_var.h	2007-05-23 16:47:19.427575488 +0200
+diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_var.h madwifi-ng-r2377-20070526.dev/net80211/ieee80211_var.h
+--- madwifi-ng-r2377-20070526.old/net80211/ieee80211_var.h	2007-05-24 23:26:38.000000000 +0200
+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_var.h	2007-05-26 18:51:09.211687152 +0200
@@ -35,8 +35,8 @@
 #ifndef _NET80211_IEEE80211_VAR_H_
 #define _NET80211_IEEE80211_VAR_H_
@ -115,9 +115,9 @@ diff -ur madwifi.old/net80211/ieee80211_var.h madwifi.dev/net80211/ieee80211_var
 
 /* Definitions for IEEE 802.11 drivers. */
 #include <net80211/ieee80211_linux.h>
-diff -ur madwifi.old/tools/do_multi.c madwifi.dev/tools/do_multi.c
--- madwifi.old/tools/do_multi.c	2007-05-23 16:46:50.718939864 +0200
-+++ madwifi.dev/tools/do_multi.c	2007-05-23 16:47:03.349019800 +0200
+diff -urN madwifi-ng-r2377-20070526.old/tools/do_multi.c madwifi-ng-r2377-20070526.dev/tools/do_multi.c
+--- madwifi-ng-r2377-20070526.old/tools/do_multi.c	2007-05-26 18:51:08.203840368 +0200
+++ madwifi-ng-r2377-20070526.dev/tools/do_multi.c	2007-05-26 18:51:09.212687000 +0200
@@ -9,16 +9,20 @@
 
     progname = basename(argv[0]);
@ -139,9 +139,9 @@ diff -ur madwifi.old/tools/do_multi.c madwifi.dev/tools/do_multi.c
     if(strcmp(progname, "athkey") == 0)
 	ret =  athkey_init(argc, argv);
     if(strcmp(progname, "athstats") == 0)
-diff -ur madwifi.old/tools/Makefile madwifi.dev/tools/Makefile
--- madwifi.old/tools/Makefile	2007-05-23 16:46:50.719939712 +0200
-+++ madwifi.dev/tools/Makefile	2007-05-23 16:47:03.349019800 +0200
+diff -urN madwifi-ng-r2377-20070526.old/tools/Makefile madwifi-ng-r2377-20070526.dev/tools/Makefile
+--- madwifi-ng-r2377-20070526.old/tools/Makefile	2007-05-26 18:51:08.203840368 +0200
+++ madwifi-ng-r2377-20070526.dev/tools/Makefile	2007-05-26 18:51:09.212687000 +0200
@@ -52,7 +52,7 @@
 	
 ifdef DOMULTI
--- a/package/madwifi/patches/300-napi_polling.patch
+++ b/package/madwifi/patches/300-napi_polling.patch
@ -1,6 +1,6 @@
-diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
--- madwifi.old/ath/if_ath.c	2007-05-21 07:49:54.571131744 +0200
-+++ madwifi.dev/ath/if_ath.c	2007-05-21 07:51:40.208072488 +0200
+diff -urN madwifi-ng-r2377-20070526.old/ath/if_ath.c madwifi-ng-r2377-20070526.dev/ath/if_ath.c
+--- madwifi-ng-r2377-20070526.old/ath/if_ath.c	2007-05-26 18:51:09.318670888 +0200
+++ madwifi-ng-r2377-20070526.dev/ath/if_ath.c	2007-05-26 18:51:09.331668912 +0200
@@ -167,7 +167,7 @@
 	int, u_int32_t);
 static void ath_setdefantenna(struct ath_softc *, u_int);
@ -10,7 +10,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 static int ath_hardstart(struct sk_buff *, struct net_device *);
 static int ath_mgtstart(struct ieee80211com *, struct sk_buff *);
 #ifdef ATH_SUPERG_COMP
-@@ -417,7 +417,6 @@
+@@ -429,7 +429,6 @@
 	ATH_TXBUF_LOCK_INIT(sc);
 	ATH_RXBUF_LOCK_INIT(sc);
 
@ -18,7 +18,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 	ATH_INIT_TQUEUE(&sc->sc_txtq,	  ath_tx_tasklet,	dev);
 	ATH_INIT_TQUEUE(&sc->sc_bmisstq,  ath_bmiss_tasklet,	dev);
 	ATH_INIT_TQUEUE(&sc->sc_bstucktq, ath_bstuck_tasklet,	dev);
-@@ -665,6 +664,8 @@
+@@ -685,6 +684,8 @@
 	dev->set_mac_address = ath_set_mac_address;
  	dev->change_mtu = ath_change_mtu;
 	dev->tx_queue_len = ATH_TXBUF - 1;		/* 1 for mgmt frame */
@ -27,7 +27,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 #ifdef USE_HEADERLEN_RESV
 	dev->hard_header_len += sizeof(struct ieee80211_qosframe) +
 				sizeof(struct llc) +
-@@ -1635,6 +1636,7 @@
+@@ -1653,6 +1654,7 @@
 	 */
 	ath_hal_getisr(ah, &status);		/* NB: clears ISR too */
 	DPRINTF(sc, ATH_DEBUG_INTR, "%s: status 0x%x\n", __func__, status);
@ -35,10 +35,10 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 	status &= sc->sc_imask;			/* discard unasked for bits */
 	if (status & HAL_INT_FATAL) {
 		sc->sc_stats.ast_hardware++;
-@@ -1674,7 +1676,12 @@
- 			 * might take too long to fire */
- 			ath_hal_process_noisefloor(ah);
- 			sc->sc_channoise = ath_hal_get_channel_noise(ah, &(sc->sc_curchan));
+@@ -1688,7 +1690,12 @@
+ 		if (status & HAL_INT_RX) {
+ 			sc->sc_tsf = ath_hal_gettsf64(ah);
+ 			ath_uapsd_processtriggers(sc);
 -			ATH_SCHEDULE_TQUEUE(&sc->sc_rxtq, &needmark);
 +			sc->sc_isr &= ~HAL_INT_RX;
 +			if (netif_rx_schedule_prep(dev)) {
@ -49,7 +49,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 		}
 		if (status & HAL_INT_TX) {
 #ifdef ATH_SUPERG_DYNTURBO
-@@ -1700,6 +1707,11 @@
+@@ -1714,6 +1721,11 @@
 				}
 			} 
 #endif
@ -61,7 +61,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 			ATH_SCHEDULE_TQUEUE(&sc->sc_txtq, &needmark);
 		}
 		if (status & HAL_INT_BMISS) {
-@@ -2162,12 +2174,13 @@
+@@ -2176,12 +2188,13 @@
 	 * Insert the frame on the outbound list and
 	 * pass it on to the hardware.
 	 */
@ -76,7 +76,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 		ath_hal_intrset(ah, sc->sc_imask & ~HAL_INT_SWBA);
 		ATH_TXQ_INSERT_TAIL(txq, bf, bf_list);
 		DPRINTF(sc, ATH_DEBUG_TX_PROC, "%s: txq depth = %d\n", __func__, txq->axq_depth);
-@@ -2183,6 +2196,7 @@
+@@ -2197,6 +2210,7 @@
 				ito64(bf->bf_daddr), bf->bf_desc);
 		}
 		txq->axq_link = &lastds->ds_link;
@ -84,7 +84,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 		ath_hal_intrset(ah, sc->sc_imask);
 	} else {
 		ATH_TXQ_INSERT_TAIL(txq, bf, bf_list);
-@@ -2218,7 +2232,7 @@
+@@ -2232,7 +2246,7 @@
 			}
 		}
 	}
@ -93,7 +93,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 
 	sc->sc_devstats.tx_packets++;
 	sc->sc_devstats.tx_bytes += framelen;
-@@ -2369,8 +2383,14 @@
+@@ -2383,8 +2397,14 @@
 	unsigned int pktlen;
 	int framecnt;
 
@ -109,7 +109,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 
 		bf_ff = TAILQ_LAST(&txq->axq_stageq, axq_headtype);
 		if ((!bf_ff) || ath_ff_flushdonetest(txq, bf_ff)) {
-@@ -2384,7 +2404,7 @@
+@@ -2398,7 +2418,7 @@
 		ATH_NODE(ni)->an_tx_ffbuf[bf_ff->bf_skb->priority] = NULL;
 		TAILQ_REMOVE(&txq->axq_stageq, bf_ff, bf_stagelist);
 
@ -118,7 +118,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 
 		/* encap and xmit */
 		bf_ff->bf_skb = ieee80211_encap(ni, bf_ff->bf_skb, &framecnt);
-@@ -2405,15 +2425,16 @@
+@@ -2419,15 +2439,16 @@
 		}
 		bf_ff->bf_node = NULL;
 
@ -138,7 +138,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 	bf = STAILQ_FIRST(&sc->sc_txbuf);				\
 	if (bf != NULL) {						\
 		STAILQ_REMOVE_HEAD(&sc->sc_txbuf, bf_list);		\
-@@ -2428,11 +2449,23 @@
+@@ -2442,11 +2463,23 @@
 		sc->sc_devstopped = 1;					\
 		ATH_SCHEDULE_TQUEUE(&sc->sc_txtq, NULL); 		\
 	}								\
@ -163,7 +163,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 	}
 
 /*
-@@ -2494,6 +2527,7 @@
+@@ -2508,6 +2541,7 @@
 	if (M_FLAG_GET(skb, M_UAPSD)) {
 		/* bypass FF handling */
 		ATH_HARDSTART_GET_TX_BUF_WITH_LOCK;
@ -171,7 +171,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 		if (bf == NULL)
 			goto hardstart_fail;
 		goto ff_bypass;
-@@ -2515,7 +2549,7 @@
+@@ -2529,7 +2563,7 @@
 	/* NB: use this lock to protect an->an_ff_txbuf in athff_can_aggregate()
 	 *     call too.
 	 */
@ -180,7 +180,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 	if (athff_can_aggregate(sc, eh, an, skb, vap->iv_fragthreshold, &ff_flush)) {
 
 		if (an->an_tx_ffbuf[skb->priority]) { /* i.e., frame on the staging queue */
-@@ -2525,7 +2559,7 @@
+@@ -2539,7 +2573,7 @@
 			TAILQ_REMOVE(&txq->axq_stageq, bf, bf_stagelist);
 			an->an_tx_ffbuf[skb->priority] = NULL;
 
@ -189,7 +189,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 
 			/*
 			 * chain skbs and add FF magic
-@@ -2552,6 +2586,7 @@
+@@ -2566,6 +2600,7 @@
 			 *     to give the buffer back.
 			 */
 			ATH_HARDSTART_GET_TX_BUF_WITH_LOCK;
@ -197,7 +197,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 			if (bf == NULL) {
 				ATH_TXQ_UNLOCK(txq);
 				goto hardstart_fail;
-@@ -2566,7 +2601,7 @@
+@@ -2580,7 +2615,7 @@
 
 			TAILQ_INSERT_HEAD(&txq->axq_stageq, bf, bf_stagelist);
 
@ -206,7 +206,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 
 			return 0;
 		}
-@@ -2577,7 +2612,7 @@
+@@ -2591,7 +2626,7 @@
 			TAILQ_REMOVE(&txq->axq_stageq, bf_ff, bf_stagelist);
 			an->an_tx_ffbuf[skb->priority] = NULL;
 
@ -215,7 +215,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 
 			/* encap and xmit */
 			bf_ff->bf_skb = ieee80211_encap(ni, bf_ff->bf_skb, &framecnt);
-@@ -2607,9 +2642,9 @@
+@@ -2621,9 +2656,9 @@
 			}
 			bf_ff->bf_node = NULL;
 
@ -227,7 +227,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 			goto ff_flushdone;
 		}
 		/*
-@@ -2619,14 +2654,13 @@
+@@ -2633,14 +2668,13 @@
 		else if (an->an_tx_ffbuf[skb->priority]) {
 			DPRINTF(sc, ATH_DEBUG_XMIT | ATH_DEBUG_FF,
 				"%s: Out-Of-Order fast-frame\n", __func__);
@ -245,7 +245,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 	}
 
 ff_bypass:
-@@ -2634,6 +2668,7 @@
+@@ -2648,6 +2682,7 @@
 #else /* ATH_SUPERG_FF */
 
 	ATH_HARDSTART_GET_TX_BUF_WITH_LOCK;
@ -253,7 +253,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 
 #endif /* ATH_SUPERG_FF */
 
-@@ -2655,7 +2690,7 @@
+@@ -2669,7 +2704,7 @@
 		 *  Allocate 1 ath_buf for each frame given 1 was 
 		 *  already alloc'd
 		 */
@ -262,7 +262,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 		for (bfcnt = 1; bfcnt < framecnt; ++bfcnt) {
 			if ((tbf = STAILQ_FIRST(&sc->sc_txbuf)) != NULL) {
 				STAILQ_REMOVE_HEAD(&sc->sc_txbuf, bf_list);
-@@ -2676,11 +2711,11 @@
+@@ -2690,11 +2725,11 @@
 					STAILQ_INSERT_TAIL(&sc->sc_txbuf, tbf, bf_list);
 				}
 			}
@ -276,7 +276,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 
 		while ((bf = STAILQ_FIRST(&bf_head)) != NULL && skb != NULL) {
 			unsigned int nextfraglen = 0;
-@@ -2716,7 +2751,7 @@
+@@ -2730,7 +2765,7 @@
 
 hardstart_fail:
 	if (!STAILQ_EMPTY(&bf_head)) {
@ -285,7 +285,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 		STAILQ_FOREACH_SAFE(tbf, &bf_head, bf_list, tempbf) {
 			tbf->bf_skb = NULL;
 			tbf->bf_node = NULL;
-@@ -2726,7 +2761,7 @@
+@@ -2740,7 +2775,7 @@
 
 			STAILQ_INSERT_TAIL(&sc->sc_txbuf, tbf, bf_list);
 		}
@ -294,7 +294,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 	}
 
 	/* free sk_buffs */
-@@ -2769,7 +2804,7 @@
+@@ -2783,7 +2818,7 @@
 	/*
 	 * Grab a TX buffer and associated resources.
 	 */
@ -303,7 +303,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 	bf = STAILQ_FIRST(&sc->sc_txbuf);
 	if (bf != NULL)
 		STAILQ_REMOVE_HEAD(&sc->sc_txbuf, bf_list);
-@@ -2780,7 +2815,7 @@
+@@ -2794,7 +2829,7 @@
 		sc->sc_devstopped=1;
 		ATH_SCHEDULE_TQUEUE(&sc->sc_txtq, NULL);
 	}
@ -312,7 +312,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 	if (bf == NULL) {
 		printk("ath_mgtstart: discard, no xmit buf\n");
 		sc->sc_stats.ast_tx_nobufmgt++;
-@@ -2809,9 +2844,9 @@
+@@ -2823,9 +2858,9 @@
 		bf->bf_skb = NULL;
 		bf->bf_node = NULL;
 
@ -324,7 +324,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 	}
 	dev_kfree_skb_any(skb);
 	skb = NULL;
-@@ -3279,10 +3314,10 @@
+@@ -3293,10 +3328,10 @@
 	 *
 	 * XXX Using in_softirq is not right since we might
 	 * be called from other soft irq contexts than
@ -337,7 +337,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 	netif_stop_queue(dev);
 }
 
-@@ -3295,7 +3330,7 @@
+@@ -3309,7 +3344,7 @@
 	DPRINTF(sc, ATH_DEBUG_KEYCACHE, "%s:\n", __func__);
 	netif_start_queue(dev);
 	if (!in_softirq())		/* NB: see above */
@ -346,7 +346,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 }
 
 /*
-@@ -4861,9 +4896,9 @@
+@@ -4875,9 +4910,9 @@
 		bf->bf_node = NULL;
 		bf->bf_desc->ds_link = 0;
 		
@ -358,7 +358,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 
 		an->an_uapsd_overflowqdepth--;
 	}
-@@ -5542,13 +5577,12 @@
+@@ -5553,13 +5588,12 @@
 	sc->sc_rxotherant = 0;
 }
 
@ -374,23 +374,23 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 	struct ath_buf *bf;
 	struct ath_softc *sc = dev->priv;
 	struct ieee80211com *ic = &sc->sc_ic;
-@@ -5560,11 +5594,15 @@
+@@ -5571,12 +5605,15 @@
 	unsigned int len;
 	int type;
 	u_int phyerr;
-+	int processed = 0, early_stop = 0;
-+	int rx_limit = dev->quota;
+	u_int processed = 0, early_stop = 0;
+	u_int rx_limit = dev->quota;
 
 	/* Let the 802.11 layer know about the new noise floor */
+ 	sc->sc_channoise = ath_hal_get_channel_noise(ah, &(sc->sc_curchan));
 	ic->ic_channoise = sc->sc_channoise;
 	
 	DPRINTF(sc, ATH_DEBUG_RX_PROC, "%s\n", __func__);
-+
 +process_rx_again:
 	do {
 		bf = STAILQ_FIRST(&sc->sc_rxbuf);
 		if (bf == NULL) {		/* XXX ??? can this happen */
-@@ -5588,6 +5626,13 @@
+@@ -5600,6 +5637,13 @@
 			/* NB: never process the self-linked entry at the end */
 			break;
 		}
@ -404,7 +404,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 		skb = bf->bf_skb;
 		if (skb == NULL) {		/* XXX ??? can this happen */
 			printk("%s: no skbuff (%s)\n", dev->name, __func__);
-@@ -5626,6 +5671,7 @@
+@@ -5638,6 +5682,7 @@
 				sc->sc_stats.ast_rx_phyerr++;
 				phyerr = rs->rs_phyerr & 0x1f;
 				sc->sc_stats.ast_rx_phy[phyerr]++;
@ -412,7 +412,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 			}
 			if (rs->rs_status & HAL_RXERR_DECRYPT) {
 				/*
-@@ -5829,9 +5875,29 @@
+@@ -5841,9 +5886,29 @@
 		STAILQ_INSERT_TAIL(&sc->sc_rxbuf, bf, bf_list);
 		ATH_RXBUF_UNLOCK_IRQ(sc);
 	} while (ath_rxbuf_init(sc, bf) == 0);
@ -442,7 +442,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 #undef PA2DESC
 }
 
-@@ -6107,22 +6173,22 @@
+@@ -6119,22 +6184,22 @@
 				}
 			}
 
@ -469,7 +469,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 
 			bf->bf_skbaddr = bus_map_single(sc->sc_bdev,
 				skb->data, skb->len, BUS_DMA_TODEVICE);
-@@ -6588,9 +6654,9 @@
+@@ -6600,9 +6665,9 @@
 		dev_kfree_skb(lastbuf->bf_skb);
 		lastbuf->bf_skb = NULL;
 		ieee80211_unref_node(&lastbuf->bf_node);
@ -481,7 +481,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 		
 		/*
 		 *  move oldest from overflow to delivery
-@@ -7411,9 +7477,6 @@
+@@ -7427,9 +7492,6 @@
 			if (sc->sc_reapcount > ATH_TXBUF_FREE_THRESHOLD) {
 				if (!sc->sc_dfswait)
 					netif_start_queue(sc->sc_dev);
@ -491,7 +491,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 				sc->sc_reapcount = 0;
 				sc->sc_devstopped = 0;
 			} else
-@@ -7448,11 +7511,22 @@
+@@ -7464,11 +7526,22 @@
 	struct net_device *dev = (struct net_device *)data;
 	struct ath_softc *sc = dev->priv;
 
@ -514,7 +514,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 	netif_wake_queue(dev);
 
 	if (sc->sc_softled)
-@@ -7469,6 +7543,7 @@
+@@ -7485,6 +7558,7 @@
 	struct net_device *dev = (struct net_device *)data;
 	struct ath_softc *sc = dev->priv;
 
@ -522,7 +522,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 	/*
 	 * Process each active queue.
 	 */
-@@ -7489,6 +7564,16 @@
+@@ -7505,6 +7579,16 @@
 	if (sc->sc_uapsdq && txqactive(sc->sc_ah, sc->sc_uapsdq->axq_qnum))
 		ath_tx_processq(sc, sc->sc_uapsdq);
 
@ -539,7 +539,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 	netif_wake_queue(dev);
 
 	if (sc->sc_softled)
-@@ -7506,6 +7591,7 @@
+@@ -7522,6 +7606,7 @@
 	unsigned int i;
 
 	/* Process each active queue. */
@ -547,7 +547,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/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]);
-@@ -7514,6 +7600,16 @@
+@@ -7530,6 +7615,16 @@
 		ath_tx_processq(sc, sc->sc_xrtxq);
 #endif
 
@ -564,7 +564,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 	netif_wake_queue(dev);
 
 	if (sc->sc_softled)
-@@ -7612,6 +7708,7 @@
+@@ -7628,6 +7723,7 @@
 ath_draintxq(struct ath_softc *sc)
 {
 	struct ath_hal *ah = sc->sc_ah;
@ -572,7 +572,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 	unsigned int i;
 
 	/* XXX return value */
-@@ -9144,9 +9241,9 @@
+@@ -9161,9 +9257,9 @@
 	dev->mtu = mtu;
 	if ((dev->flags & IFF_RUNNING) && !sc->sc_invalid) {
 		/* NB: the rx buffers may need to be reallocated */
@ -584,9 +584,9 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 	}
 	ATH_UNLOCK(sc);
 
-diff -ur madwifi.old/ath/if_athvar.h madwifi.dev/ath/if_athvar.h
--- madwifi.old/ath/if_athvar.h	2007-05-21 07:49:54.563132960 +0200
-+++ madwifi.dev/ath/if_athvar.h	2007-05-21 07:50:22.814838048 +0200
+diff -urN madwifi-ng-r2377-20070526.old/ath/if_athvar.h madwifi-ng-r2377-20070526.dev/ath/if_athvar.h
+--- madwifi-ng-r2377-20070526.old/ath/if_athvar.h	2007-05-26 18:51:09.020716184 +0200
+++ madwifi-ng-r2377-20070526.dev/ath/if_athvar.h	2007-05-26 18:51:09.331668912 +0200
@@ -48,6 +48,10 @@
 #include "if_athioctl.h"
 #include "net80211/ieee80211.h"		/* XXX for WME_NUM_AC */
@ -629,7 +629,7 @@ diff -ur madwifi.old/ath/if_athvar.h madwifi.dev/ath/if_athvar.h
 	struct ATH_TQ_STRUCT sc_txtq;		/* tx intr tasklet */
 	u_int8_t sc_grppoll_str[GRPPOLL_RATE_STR_LEN];  
 	struct ath_descdma sc_bdma;		/* beacon descriptors */
-@@ -701,8 +709,12 @@
+@@ -702,8 +710,12 @@
 #define	ATH_TXBUF_LOCK_DESTROY(_sc)
 #define	ATH_TXBUF_LOCK(_sc)		spin_lock(&(_sc)->sc_txbuflock)
 #define	ATH_TXBUF_UNLOCK(_sc)		spin_unlock(&(_sc)->sc_txbuflock)
@ -644,7 +644,7 @@ diff -ur madwifi.old/ath/if_athvar.h madwifi.dev/ath/if_athvar.h
 #define	ATH_TXBUF_LOCK_IRQ(_sc)		do {	\
 	unsigned long __txbuflockflags;		\
 	spin_lock_irqsave(&(_sc)->sc_txbuflock, __txbuflockflags);
-@@ -720,8 +732,12 @@
+@@ -721,8 +733,12 @@
 #define	ATH_RXBUF_LOCK_DESTROY(_sc)
 #define	ATH_RXBUF_LOCK(_sc)		spin_lock(&(_sc)->sc_rxbuflock)
 #define	ATH_RXBUF_UNLOCK(_sc)		spin_unlock(&(_sc)->sc_rxbuflock)
@ -659,7 +659,7 @@ diff -ur madwifi.old/ath/if_athvar.h madwifi.dev/ath/if_athvar.h
 #define	ATH_RXBUF_LOCK_IRQ(_sc)		do {	\
 	unsigned long __rxbuflockflags;		\
 	spin_lock_irqsave(&(_sc)->sc_rxbuflock, __rxbuflockflags);
-@@ -731,6 +747,8 @@
+@@ -732,6 +748,8 @@
 #define	ATH_RXBUF_UNLOCK_IRQ_EARLY(_sc)		\
 	spin_unlock_irqrestore(&(_sc)->sc_rxbuflock, __rxbuflockflags);
 
@ -668,9 +668,9 @@ diff -ur madwifi.old/ath/if_athvar.h madwifi.dev/ath/if_athvar.h
 
 /* Protects the device from concurrent accesses */
 #define	ATH_LOCK_INIT(_sc)		init_MUTEX(&(_sc)->sc_lock)
-diff -ur madwifi.old/net80211/ieee80211_beacon.c madwifi.dev/net80211/ieee80211_beacon.c
--- madwifi.old/net80211/ieee80211_beacon.c	2007-01-31 11:41:05.000000000 +0100
-+++ madwifi.dev/net80211/ieee80211_beacon.c	2007-05-21 07:50:22.815837896 +0200
+diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_beacon.c madwifi-ng-r2377-20070526.dev/net80211/ieee80211_beacon.c
+--- madwifi-ng-r2377-20070526.old/net80211/ieee80211_beacon.c	2007-01-30 05:01:29.000000000 +0100
+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_beacon.c	2007-05-26 18:51:09.332668760 +0200
@@ -286,7 +286,7 @@
 	int len_changed = 0;
 	u_int16_t capinfo;
@ -689,10 +689,10 @@ diff -ur madwifi.old/net80211/ieee80211_beacon.c madwifi.dev/net80211/ieee80211_
 
 	return len_changed;
 }
-diff -ur madwifi.old/net80211/ieee80211_input.c madwifi.dev/net80211/ieee80211_input.c
--- madwifi.old/net80211/ieee80211_input.c	2007-05-21 07:49:54.527138432 +0200
-+++ madwifi.dev/net80211/ieee80211_input.c	2007-05-21 07:50:22.816837744 +0200
-@@ -1155,8 +1155,9 @@
+diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_input.c madwifi-ng-r2377-20070526.dev/net80211/ieee80211_input.c
+--- madwifi-ng-r2377-20070526.old/net80211/ieee80211_input.c	2007-05-26 18:51:09.107702960 +0200
+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_input.c	2007-05-26 18:51:09.333668608 +0200
+@@ -1169,8 +1169,9 @@
 		if (ni->ni_vlan != 0 && vap->iv_vlgrp != NULL) {
 			/* attach vlan tag */
 			vlan_hwaccel_receive_skb(skb, vap->iv_vlgrp, ni->ni_vlan);
@ -704,7 +704,7 @@ diff -ur madwifi.old/net80211/ieee80211_input.c madwifi.dev/net80211/ieee80211_i
 		dev->last_rx = jiffies;
 	}
 }
-@@ -3657,9 +3658,9 @@
+@@ -3668,9 +3669,9 @@
 	}
 
 	/* Okay, take the first queued packet and put it out... */
@ -716,9 +716,9 @@ diff -ur madwifi.old/net80211/ieee80211_input.c madwifi.dev/net80211/ieee80211_i
 	if (skb == NULL) {
 		IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_POWER, wh->i_addr2,
 			"%s", "recv ps-poll, but queue empty");
-diff -ur madwifi.old/net80211/ieee80211_linux.h madwifi.dev/net80211/ieee80211_linux.h
--- madwifi.old/net80211/ieee80211_linux.h	2007-05-21 07:49:54.528138280 +0200
-+++ madwifi.dev/net80211/ieee80211_linux.h	2007-05-21 07:50:22.817837592 +0200
+diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_linux.h madwifi-ng-r2377-20070526.dev/net80211/ieee80211_linux.h
+--- madwifi-ng-r2377-20070526.old/net80211/ieee80211_linux.h	2007-05-24 19:31:37.000000000 +0200
+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_linux.h	2007-05-26 18:51:09.334668456 +0200
@@ -31,6 +31,10 @@
 
 #include <linux/wireless.h>
@ -819,10 +819,10 @@ diff -ur madwifi.old/net80211/ieee80211_linux.h madwifi.dev/net80211/ieee80211_l
 
 #if (defined(CONFIG_SMP) || defined(CONFIG_DEBUG_SPINLOCK)) && defined(spin_is_locked)
 #define	ACL_LOCK_ASSERT(_as) \
-diff -ur madwifi.old/net80211/ieee80211_node.c madwifi.dev/net80211/ieee80211_node.c
--- madwifi.old/net80211/ieee80211_node.c	2007-05-21 07:49:54.555134176 +0200
-+++ madwifi.dev/net80211/ieee80211_node.c	2007-05-21 07:50:22.818837440 +0200
-@@ -1570,7 +1570,7 @@
+diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_node.c madwifi-ng-r2377-20070526.dev/net80211/ieee80211_node.c
+--- madwifi-ng-r2377-20070526.old/net80211/ieee80211_node.c	2007-05-26 18:51:08.748757528 +0200
+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_node.c	2007-05-26 18:51:09.335668304 +0200
+@@ -1567,7 +1567,7 @@
 	struct ieee80211_node *ni;
 	u_int gen;
 
@ -831,7 +831,7 @@ diff -ur madwifi.old/net80211/ieee80211_node.c madwifi.dev/net80211/ieee80211_no
 	gen = ++nt->nt_scangen;
 	
 restart:
-@@ -1590,7 +1590,7 @@
+@@ -1587,7 +1587,7 @@
 	}
 	IEEE80211_NODE_TABLE_UNLOCK_IRQ(nt);
 
@ -840,9 +840,9 @@ diff -ur madwifi.old/net80211/ieee80211_node.c madwifi.dev/net80211/ieee80211_no
 }
 EXPORT_SYMBOL(ieee80211_iterate_dev_nodes);
 
-diff -ur madwifi.old/net80211/ieee80211_power.c madwifi.dev/net80211/ieee80211_power.c
--- madwifi.old/net80211/ieee80211_power.c	2007-05-21 07:49:54.532137672 +0200
-+++ madwifi.dev/net80211/ieee80211_power.c	2007-05-21 07:50:22.818837440 +0200
+diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_power.c madwifi-ng-r2377-20070526.dev/net80211/ieee80211_power.c
+--- madwifi-ng-r2377-20070526.old/net80211/ieee80211_power.c	2007-05-24 19:31:37.000000000 +0200
+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_power.c	2007-05-26 18:51:09.336668152 +0200
@@ -147,7 +147,7 @@
 #endif
 		struct sk_buff *skb;
@ -879,19 +879,19 @@ diff -ur madwifi.old/net80211/ieee80211_power.c madwifi.dev/net80211/ieee80211_p
 }
 
 /*
-@@ -297,9 +297,9 @@
- 		struct sk_buff *skb;
- 		int qlen;
+@@ -295,9 +295,9 @@
+ 			struct sk_buff *skb;
+ 			int qlen;
 
-		IEEE80211_NODE_SAVEQ_LOCK(ni);
-+		IEEE80211_NODE_SAVEQ_LOCK_IRQ(ni);
- 		IEEE80211_NODE_SAVEQ_DEQUEUE(ni, skb, qlen);
-		IEEE80211_NODE_SAVEQ_UNLOCK(ni);
-+		IEEE80211_NODE_SAVEQ_UNLOCK_IRQ(ni);
- 		if (skb == NULL)
- 			break;
- 		/* 
-@@ -361,9 +361,9 @@
+-			IEEE80211_NODE_SAVEQ_LOCK(ni);
+			IEEE80211_NODE_SAVEQ_LOCK_IRQ(ni);
+ 			IEEE80211_NODE_SAVEQ_DEQUEUE(ni, skb, qlen);
+-			IEEE80211_NODE_SAVEQ_UNLOCK(ni);
+			IEEE80211_NODE_SAVEQ_UNLOCK_IRQ(ni);
+ 			if (skb == NULL)
+ 				break;
+ 			/* 
+@@ -362,9 +362,9 @@
 			for (;;) {
 				struct sk_buff *skb;
 
@ -903,9 +903,9 @@ diff -ur madwifi.old/net80211/ieee80211_power.c madwifi.dev/net80211/ieee80211_p
 				if (skb == NULL)
 					break;
 				ieee80211_parent_queue_xmit(skb);
-diff -ur madwifi.old/net80211/ieee80211_proto.c madwifi.dev/net80211/ieee80211_proto.c
--- madwifi.old/net80211/ieee80211_proto.c	2007-05-21 07:49:54.574131288 +0200
-+++ madwifi.dev/net80211/ieee80211_proto.c	2007-05-21 07:50:22.819837288 +0200
+diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_proto.c madwifi-ng-r2377-20070526.dev/net80211/ieee80211_proto.c
+--- madwifi-ng-r2377-20070526.old/net80211/ieee80211_proto.c	2007-05-26 18:51:09.321670432 +0200
+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_proto.c	2007-05-26 18:51:09.337668000 +0200
@@ -635,9 +635,9 @@
 {
 	struct ieee80211com *ic = vap->iv_ic;
@ -930,9 +930,9 @@ diff -ur madwifi.old/net80211/ieee80211_proto.c madwifi.dev/net80211/ieee80211_p
 	}
 }
 
-diff -ur madwifi.old/net80211/ieee80211_scan_sta.c madwifi.dev/net80211/ieee80211_scan_sta.c
--- madwifi.old/net80211/ieee80211_scan_sta.c	2006-09-20 10:45:13.000000000 +0200
-+++ madwifi.dev/net80211/ieee80211_scan_sta.c	2007-05-21 07:50:22.819837288 +0200
+diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_scan_sta.c madwifi-ng-r2377-20070526.dev/net80211/ieee80211_scan_sta.c
+--- madwifi-ng-r2377-20070526.old/net80211/ieee80211_scan_sta.c	2007-05-21 17:53:39.000000000 +0200
+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_scan_sta.c	2007-05-26 18:51:09.338667848 +0200
@@ -163,9 +163,11 @@
 {
 	struct sta_table *st = ss->ss_priv;
--- a/package/madwifi/patches/305-pureg_fix.patch
+++ b/package/madwifi/patches/305-pureg_fix.patch
@ -1,7 +1,7 @@
-diff -urN madwifi-ng-refcount-r2313-20070505.old/ath/if_ath.c madwifi-ng-refcount-r2313-20070505.dev/ath/if_ath.c
--- madwifi-ng-refcount-r2313-20070505.old/ath/if_ath.c	2007-05-13 18:17:56.686951312 +0200
-+++ madwifi-ng-refcount-r2313-20070505.dev/ath/if_ath.c	2007-05-13 18:17:56.700949184 +0200
-@@ -3426,7 +3426,9 @@
+diff -urN madwifi-ng-r2377-20070526.old/ath/if_ath.c madwifi-ng-r2377-20070526.dev/ath/if_ath.c
+--- madwifi-ng-r2377-20070526.old/ath/if_ath.c	2007-05-26 18:51:09.426654472 +0200
+++ madwifi-ng-r2377-20070526.dev/ath/if_ath.c	2007-05-26 18:51:09.440652344 +0200
+@@ -3383,7 +3383,9 @@
 		rfilt |= HAL_RX_FILTER_PROM;
 	if (ic->ic_opmode == IEEE80211_M_STA ||
 	    sc->sc_opmode == HAL_M_IBSS ||	/* NB: AHDEMO too */
@ -12,9 +12,9 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/ath/if_ath.c madwifi-ng-refcoun
 		rfilt |= HAL_RX_FILTER_BEACON;
 	if (sc->sc_nmonvaps > 0) 
 		rfilt |= (HAL_RX_FILTER_CONTROL | HAL_RX_FILTER_BEACON | 
-diff -urN madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_input.c madwifi-ng-refcount-r2313-20070505.dev/net80211/ieee80211_input.c
--- madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_input.c	2007-05-13 18:17:56.688951008 +0200
-+++ madwifi-ng-refcount-r2313-20070505.dev/net80211/ieee80211_input.c	2007-05-13 18:17:56.701949032 +0200
+diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_input.c madwifi-ng-r2377-20070526.dev/net80211/ieee80211_input.c
+--- madwifi-ng-r2377-20070526.old/net80211/ieee80211_input.c	2007-05-26 18:51:09.429654016 +0200
+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_input.c	2007-05-26 18:51:09.443651888 +0200
@@ -343,11 +343,12 @@
 				bssid = wh->i_addr3;
 			}
@ -40,7 +40,7 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_input.c madw
 				/* not interested in */
 				IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
 					bssid, NULL, "%s", "not to bss");
-@@ -2560,7 +2562,7 @@
+@@ -2593,7 +2595,7 @@
 	u_int8_t *frm, *efrm;
 	u_int8_t *ssid, *rates, *xrates, *wpa, *rsn, *wme, *ath;
 	u_int8_t rate;
@ -49,7 +49,7 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_input.c madw
 	u_int8_t qosinfo;
 
 	wh = (struct ieee80211_frame *) skb->data;
-@@ -2582,11 +2584,15 @@
+@@ -2615,11 +2617,15 @@
 		 *    o station mode when associated (to collect state
 		 *      updates such as 802.11g slot time), or
 		 *    o adhoc mode (to discover neighbors)
@ -66,7 +66,7 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_input.c madw
 			vap->iv_stats.is_rx_mgtdiscard++;
 			return;
 		}
-@@ -2669,6 +2675,7 @@
+@@ -2702,6 +2708,7 @@
 					break;
 				}
 				scan.erp = frm[2];
@ -74,7 +74,7 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_input.c madw
 				break;
 			case IEEE80211_ELEMID_RSN:
 				scan.rsn = frm;
-@@ -2810,7 +2817,7 @@
+@@ -2855,7 +2862,7 @@
 			    vap->iv_flags_ext & IEEE80211_FEXT_SWBMISS) {
 				mod_timer(&vap->iv_swbmiss, jiffies + vap->iv_swbmiss_period);
 			}
@ -83,7 +83,7 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_input.c madw
 			/*
 			 * If scanning, pass the info to the scan module.
 			 * Otherwise, check if it's the right time to do
-@@ -2832,6 +2839,20 @@
+@@ -2877,6 +2884,20 @@
 				ieee80211_bg_scan(vap);
 			return;
 		}
@ -104,10 +104,10 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_input.c madw
 		/*
 		 * If scanning, just pass information to the scan module.
 		 */
-diff -urN madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_node.c madwifi-ng-refcount-r2313-20070505.dev/net80211/ieee80211_node.c
--- madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_node.c	2007-05-13 18:17:56.690950704 +0200
-+++ madwifi-ng-refcount-r2313-20070505.dev/net80211/ieee80211_node.c	2007-05-13 18:17:56.702948880 +0200
-@@ -331,10 +331,16 @@
+diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_node.c madwifi-ng-r2377-20070526.dev/net80211/ieee80211_node.c
+--- madwifi-ng-r2377-20070526.old/net80211/ieee80211_node.c	2007-05-26 18:51:09.430653864 +0200
+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_node.c	2007-05-26 18:51:09.444651736 +0200
+@@ -332,10 +332,16 @@
 	/* Update country ie information */
 	ieee80211_build_countryie(ic);
 
@ -126,9 +126,9 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_node.c madwi
 
 	(void) ieee80211_sta_join1(PASS_NODE(ni));
 }
-diff -urN madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_proto.c madwifi-ng-refcount-r2313-20070505.dev/net80211/ieee80211_proto.c
--- madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_proto.c	2007-05-13 18:17:56.691950552 +0200
-+++ madwifi-ng-refcount-r2313-20070505.dev/net80211/ieee80211_proto.c	2007-05-13 18:17:56.703948728 +0200
+diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_proto.c madwifi-ng-r2377-20070526.dev/net80211/ieee80211_proto.c
+--- madwifi-ng-r2377-20070526.old/net80211/ieee80211_proto.c	2007-05-26 18:51:09.431653712 +0200
+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_proto.c	2007-05-26 18:51:09.445651584 +0200
@@ -586,6 +586,28 @@
     { 4, { 2, 4, 11, 22 } },	/* IEEE80211_MODE_TURBO_G (mixed b/g) */
 };
@ -158,10 +158,10 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_proto.c madw
 /*
  * Mark the basic rates for the 11g rate table based on the
  * specified mode.  For 11b compatibility we mark only 11b
-diff -urN madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_var.h madwifi-ng-refcount-r2313-20070505.dev/net80211/ieee80211_var.h
--- madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_var.h	2007-05-13 18:17:56.579967576 +0200
-+++ madwifi-ng-refcount-r2313-20070505.dev/net80211/ieee80211_var.h	2007-05-13 18:17:56.704948576 +0200
-@@ -581,6 +581,8 @@
+diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_var.h madwifi-ng-r2377-20070526.dev/net80211/ieee80211_var.h
+--- madwifi-ng-r2377-20070526.old/net80211/ieee80211_var.h	2007-05-26 18:51:09.321670432 +0200
+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_var.h	2007-05-26 18:51:09.445651584 +0200
+@@ -584,6 +584,8 @@
 void ieee80211_build_countryie(struct ieee80211com *);
 int ieee80211_media_setup(struct ieee80211com *, struct ifmedia *, u_int32_t,
 	ifm_change_cb_t, ifm_stat_cb_t);
--- a/package/madwifi/patches/309-micfail_detect.patch
+++ b/package/madwifi/patches/309-micfail_detect.patch
@ -1,15 +1,15 @@
-diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
--- madwifi.old/ath/if_ath.c	2007-05-21 07:53:37.247279824 +0200
-+++ madwifi.dev/ath/if_ath.c	2007-05-21 07:55:23.290158856 +0200
-@@ -5598,6 +5598,7 @@
+diff -urN madwifi-ng-r2377-20070526.old/ath/if_ath.c madwifi-ng-r2377-20070526.dev/ath/if_ath.c
+--- madwifi-ng-r2377-20070526.old/ath/if_ath.c	2007-05-26 18:51:09.532638360 +0200
+++ madwifi-ng-r2377-20070526.dev/ath/if_ath.c	2007-05-26 18:51:09.544636536 +0200
+@@ -5609,6 +5609,7 @@
 	u_int phyerr;
- 	int processed = 0, early_stop = 0;
- 	int rx_limit = dev->quota;
-+	int mic_fail = 0;
+ 	u_int processed = 0, early_stop = 0;
+ 	u_int rx_limit = dev->quota;
+	u_int mic_fail = 0;
 
 	/* Let the 802.11 layer know about the new noise floor */
- 	ic->ic_channoise = sc->sc_channoise;
-@@ -5692,31 +5693,16 @@
+ 	sc->sc_channoise = ath_hal_get_channel_noise(ah, &(sc->sc_curchan));
+@@ -5703,31 +5704,16 @@
 			}
 			if (rs->rs_status & HAL_RXERR_MIC) {
 				sc->sc_stats.ast_rx_badmic++;
@ -46,7 +46,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 		}
 rx_accept:
 		/*
-@@ -5800,6 +5786,20 @@
+@@ -5811,6 +5797,20 @@
 				   rs->rs_rssi);
 		}
 
@ -67,9 +67,9 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 		/*
 		 * Locate the node for sender, track state, and then
 		 * pass the (referenced) node up to the 802.11 layer
-diff -ur madwifi.old/net80211/ieee80211_crypto_ccmp.c madwifi.dev/net80211/ieee80211_crypto_ccmp.c
--- madwifi.old/net80211/ieee80211_crypto_ccmp.c	2007-05-18 13:19:16.000000000 +0200
-+++ madwifi.dev/net80211/ieee80211_crypto_ccmp.c	2007-05-21 07:54:24.892036720 +0200
+diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_crypto_ccmp.c madwifi-ng-r2377-20070526.dev/net80211/ieee80211_crypto_ccmp.c
+--- madwifi-ng-r2377-20070526.old/net80211/ieee80211_crypto_ccmp.c	2007-05-17 00:13:10.000000000 +0200
+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_crypto_ccmp.c	2007-05-26 18:51:09.545636384 +0200
@@ -78,7 +78,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);
@ -88,9 +88,9 @@ diff -ur madwifi.old/net80211/ieee80211_crypto_ccmp.c madwifi.dev/net80211/ieee8
 {
 	return 1;
 }
-diff -ur madwifi.old/net80211/ieee80211_crypto.h madwifi.dev/net80211/ieee80211_crypto.h
--- madwifi.old/net80211/ieee80211_crypto.h	2007-05-04 15:45:58.000000000 +0200
-+++ madwifi.dev/net80211/ieee80211_crypto.h	2007-05-21 07:54:24.893036568 +0200
+diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_crypto.h madwifi-ng-r2377-20070526.dev/net80211/ieee80211_crypto.h
+--- madwifi-ng-r2377-20070526.old/net80211/ieee80211_crypto.h	2007-04-16 14:32:29.000000000 +0200
+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_crypto.h	2007-05-26 18:51:09.545636384 +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);
@ -113,9 +113,9 @@ diff -ur madwifi.old/net80211/ieee80211_crypto.h madwifi.dev/net80211/ieee80211_
 }
 
 /*
-diff -ur madwifi.old/net80211/ieee80211_crypto_none.c madwifi.dev/net80211/ieee80211_crypto_none.c
--- madwifi.old/net80211/ieee80211_crypto_none.c	2006-09-20 10:45:13.000000000 +0200
-+++ madwifi.dev/net80211/ieee80211_crypto_none.c	2007-05-21 07:54:24.893036568 +0200
+diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_crypto_none.c madwifi-ng-r2377-20070526.dev/net80211/ieee80211_crypto_none.c
+--- madwifi-ng-r2377-20070526.old/net80211/ieee80211_crypto_none.c	2006-09-20 10:45:13.000000000 +0200
+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_crypto_none.c	2007-05-26 18:51:09.545636384 +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);
@ -134,9 +134,9 @@ diff -ur madwifi.old/net80211/ieee80211_crypto_none.c madwifi.dev/net80211/ieee8
 {
 	struct ieee80211vap *vap = k->wk_private;
 
-diff -ur madwifi.old/net80211/ieee80211_crypto_tkip.c madwifi.dev/net80211/ieee80211_crypto_tkip.c
--- madwifi.old/net80211/ieee80211_crypto_tkip.c	2007-05-18 13:19:16.000000000 +0200
-+++ madwifi.dev/net80211/ieee80211_crypto_tkip.c	2007-05-21 07:54:24.893036568 +0200
+diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_crypto_tkip.c madwifi-ng-r2377-20070526.dev/net80211/ieee80211_crypto_tkip.c
+--- madwifi-ng-r2377-20070526.old/net80211/ieee80211_crypto_tkip.c	2007-05-17 00:13:10.000000000 +0200
+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_crypto_tkip.c	2007-05-26 18:51:09.546636232 +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);
@ -164,9 +164,9 @@ diff -ur madwifi.old/net80211/ieee80211_crypto_tkip.c madwifi.dev/net80211/ieee8
 		struct ieee80211vap *vap = ctx->tc_vap;
 		u8 mic[IEEE80211_WEP_MICLEN];
 		u8 mic0[IEEE80211_WEP_MICLEN];
-diff -ur madwifi.old/net80211/ieee80211_crypto_wep.c madwifi.dev/net80211/ieee80211_crypto_wep.c
--- madwifi.old/net80211/ieee80211_crypto_wep.c	2006-09-20 10:45:13.000000000 +0200
-+++ madwifi.dev/net80211/ieee80211_crypto_wep.c	2007-05-21 07:54:24.894036416 +0200
+diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_crypto_wep.c madwifi-ng-r2377-20070526.dev/net80211/ieee80211_crypto_wep.c
+--- madwifi-ng-r2377-20070526.old/net80211/ieee80211_crypto_wep.c	2006-09-20 10:45:13.000000000 +0200
+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_crypto_wep.c	2007-05-26 18:51:09.547636080 +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);
@ -185,9 +185,9 @@ diff -ur madwifi.old/net80211/ieee80211_crypto_wep.c madwifi.dev/net80211/ieee80
 {
 	return 1;
 }
-diff -ur madwifi.old/net80211/ieee80211_input.c madwifi.dev/net80211/ieee80211_input.c
--- madwifi.old/net80211/ieee80211_input.c	2007-05-21 07:53:37.249279520 +0200
-+++ madwifi.dev/net80211/ieee80211_input.c	2007-05-21 07:54:24.895036264 +0200
+diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_input.c madwifi-ng-r2377-20070526.dev/net80211/ieee80211_input.c
+--- madwifi-ng-r2377-20070526.old/net80211/ieee80211_input.c	2007-05-26 18:51:09.534638056 +0200
+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_input.c	2007-05-26 18:51:09.548635928 +0200
@@ -654,7 +654,7 @@
 		 * Next strip any MSDU crypto bits.
 		 */
@ -197,7 +197,7 @@ diff -ur madwifi.old/net80211/ieee80211_input.c madwifi.dev/net80211/ieee80211_i
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
 				ni->ni_macaddr, "data", "%s", "demic error");
 			IEEE80211_NODE_STAT(ni, rx_demicfail);
-@@ -3778,6 +3778,47 @@
+@@ -3789,6 +3789,47 @@
 }
 #endif
 
@ -245,9 +245,9 @@ diff -ur madwifi.old/net80211/ieee80211_input.c madwifi.dev/net80211/ieee80211_i
 #ifdef IEEE80211_DEBUG
 /*
  * Debugging support.
-diff -ur madwifi.old/net80211/ieee80211_linux.c madwifi.dev/net80211/ieee80211_linux.c
--- madwifi.old/net80211/ieee80211_linux.c	2007-05-21 07:49:54.528138280 +0200
-+++ madwifi.dev/net80211/ieee80211_linux.c	2007-05-21 07:54:24.896036112 +0200
+diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_linux.c madwifi-ng-r2377-20070526.dev/net80211/ieee80211_linux.c
+--- madwifi-ng-r2377-20070526.old/net80211/ieee80211_linux.c	2007-05-21 17:53:39.000000000 +0200
+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_linux.c	2007-05-26 18:51:09.549635776 +0200
@@ -311,8 +311,8 @@
 
 	/* TODO: needed parameters: count, keyid, key type, src address, TSC */
@ -259,9 +259,9 @@ diff -ur madwifi.old/net80211/ieee80211_linux.c madwifi.dev/net80211/ieee80211_l
 	memset(&wrqu, 0, sizeof(wrqu));
 	wrqu.data.length = strlen(buf);
 	wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf);
-diff -ur madwifi.old/net80211/ieee80211_proto.h madwifi.dev/net80211/ieee80211_proto.h
--- madwifi.old/net80211/ieee80211_proto.h	2007-05-21 07:49:54.574131288 +0200
-+++ madwifi.dev/net80211/ieee80211_proto.h	2007-05-21 07:54:24.896036112 +0200
+diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_proto.h madwifi-ng-r2377-20070526.dev/net80211/ieee80211_proto.h
+--- madwifi-ng-r2377-20070526.old/net80211/ieee80211_proto.h	2007-05-26 18:51:09.321670432 +0200
+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_proto.h	2007-05-26 18:51:09.549635776 +0200
@@ -91,6 +91,7 @@
 void ieee80211_set11gbasicrates(struct ieee80211_rateset *, enum ieee80211_phymode);
 enum ieee80211_phymode ieee80211_get11gbasicrates(struct ieee80211_rateset *);
--- a/package/madwifi/patches/310-erp_beacon_check.patch
+++ b/package/madwifi/patches/310-erp_beacon_check.patch
@ -1,6 +1,6 @@
-diff -urN madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_beacon.c madwifi-ng-refcount-r2313-20070505.dev/net80211/ieee80211_beacon.c
--- madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_beacon.c	2007-05-13 18:17:56.687951160 +0200
-+++ madwifi-ng-refcount-r2313-20070505.dev/net80211/ieee80211_beacon.c	2007-05-13 18:17:56.971907992 +0200
+diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_beacon.c madwifi-ng-r2377-20070526.dev/net80211/ieee80211_beacon.c
+--- madwifi-ng-r2377-20070526.old/net80211/ieee80211_beacon.c	2007-05-26 18:51:09.428654168 +0200
+++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_beacon.c	2007-05-26 18:51:09.645621184 +0200
@@ -512,7 +512,7 @@
 			vap->iv_flags &= ~IEEE80211_F_XRUPDATE;
 		}