From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 13 Jul 2007 09:18:45 +0000 (+0000)
Subject: refresh madwifi patches
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f44014020da871fd04a5b1ec9e7069a378913350;p=openwrt%2Fstaging%2Fldir.git

refresh madwifi patches

SVN-Revision: 7961
---

diff --git a/package/madwifi/patches/100-kernel_cflags.patch b/package/madwifi/patches/100-kernel_cflags.patch
index aeea704128..b1c43aafc6 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-11 22:59:39.612105910 +0200
-+++ madwifi-ng-r2568-20070710/hal/public/mips-be-elf.inc	2007-07-11 22:59:39.756114120 +0200
+--- 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
 @@ -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-11 22:59:39.616106139 +0200
-+++ madwifi-ng-r2568-20070710/hal/public/mips-le-elf.inc	2007-07-11 22:59:39.760114346 +0200
+--- 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
 @@ -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-11 22:59:39.628106822 +0200
-+++ madwifi-ng-r2568-20070710/hal/public/xscale-be-elf.inc	2007-07-11 22:59:39.788115941 +0200
+--- 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
 @@ -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 15ea8a035b..3b31f0e2c9 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-11 22:59:39.484098617 +0200
-+++ madwifi-ng-r2568-20070710/tools/80211debug.c	2007-07-11 22:59:40.108134179 +0200
+--- 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
 @@ -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-11 22:59:39.488098843 +0200
-+++ madwifi-ng-r2568-20070710/tools/80211stats.c	2007-07-11 22:59:40.112134405 +0200
+--- 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
 @@ -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-11 22:59:39.496099302 +0200
-+++ madwifi-ng-r2568-20070710/tools/athchans.c	2007-07-11 22:59:40.184138509 +0200
+--- 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
 @@ -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-11 22:59:39.504099754 +0200
-+++ madwifi-ng-r2568-20070710/tools/athctrl.c	2007-07-11 22:59:40.216140332 +0200
+--- 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
 @@ -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-11 22:59:39.508099983 +0200
-+++ madwifi-ng-r2568-20070710/tools/athdebug.c	2007-07-11 22:59:40.236141472 +0200
+--- 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
 @@ -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-11 22:59:39.516100443 +0200
-+++ madwifi-ng-r2568-20070710/tools/athkey.c	2007-07-11 22:59:40.288144436 +0200
+--- 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
 @@ -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-11 22:59:39.524100895 +0200
-+++ madwifi-ng-r2568-20070710/tools/athstats.c	2007-07-11 22:59:40.328146718 +0200
+--- 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
 @@ -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-11 22:59:40.348147859 +0200
++++ madwifi-ng-r2568-20070710/tools/do_multi.c	2007-07-13 11:18:15.265166457 +0200
 @@ -0,0 +1,30 @@
 +#include <string.h>
 +#include "do_multi.h"
@@ -284,7 +284,7 @@ Index: madwifi-ng-r2568-20070710/tools/do_multi.c
 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-11 22:59:40.372149222 +0200
++++ madwifi-ng-r2568-20070710/tools/do_multi.h	2007-07-13 11:18:15.293168054 +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-11 22:59:39.540101806 +0200
-+++ madwifi-ng-r2568-20070710/tools/Makefile	2007-07-11 22:59:40.388150134 +0200
+--- 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
 @@ -49,6 +49,12 @@
  
  ALL=	athstats 80211stats athkey athchans athctrl \
@@ -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-11 22:59:39.548102266 +0200
-+++ madwifi-ng-r2568-20070710/tools/wlanconfig.c	2007-07-11 22:59:40.404151049 +0200
+--- 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
 @@ -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 0a9774572a..875de0567d 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-11 22:59:39.408094285 +0200
-+++ madwifi-ng-r2568-20070710/ath/if_ath.c	2007-07-11 22:59:40.828175211 +0200
+--- 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
 @@ -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 92878457f1..1e7cbeb3c0 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-11 22:59:39.332089952 +0200
-+++ madwifi-ng-r2568-20070710/net80211/ieee80211_rate.c	2007-07-11 22:59:41.136192763 +0200
+--- 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
 @@ -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 89b42318d0..661946f46d 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-11 22:59:40.828175211 +0200
-+++ madwifi-ng-r2568-20070710/ath/if_ath.c	2007-07-11 22:59:41.372206215 +0200
+--- 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
 @@ -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 d88e602e3f..a0065b6392 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-11 22:59:39.180081291 +0200
-+++ madwifi-ng-r2568-20070710/ath_rate/minstrel/minstrel.c	2007-07-11 22:59:41.620220346 +0200
+--- 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
 @@ -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 e63696127a..643190b237 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-11 22:59:41.372206215 +0200
-+++ madwifi-ng-r2568-20070710/ath/if_ath.c	2007-07-11 22:59:41.856233797 +0200
+--- 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
 @@ -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-11 22:59:39.096076505 +0200
-+++ madwifi-ng-r2568-20070710/net80211/ieee80211_node.c	2007-07-11 22:59:41.860234023 +0200
+--- 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
 @@ -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-11 22:59:39.104076962 +0200
-+++ madwifi-ng-r2568-20070710/net80211/ieee80211_node.h	2007-07-11 22:59:41.884235392 +0200
+--- 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
 @@ -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 a4917646a9..15dfdcec1b 100644
--- a/package/madwifi/patches/113-no_ibss_pwrsave.patch
+++ b/package/madwifi/patches/113-no_ibss_pwrsave.patch
@@ -1,7 +1,7 @@
 Index: madwifi-ng-r2568-20070710/net80211/ieee80211_scan.c
 ===================================================================
---- madwifi-ng-r2568-20070710.orig/net80211/ieee80211_scan.c	2007-07-11 22:59:39.012071719 +0200
-+++ madwifi-ng-r2568-20070710/net80211/ieee80211_scan.c	2007-07-11 22:59:42.172251804 +0200
+--- 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
 @@ -291,7 +291,8 @@
  	struct ieee80211com *ic = vap->iv_ic;
  	int delay;
diff --git a/package/madwifi/patches/116-adhoc_beacon_PR_1033.patch b/package/madwifi/patches/116-adhoc_beacon_PR_1033.patch
index 781635c919..34087a9b50 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-11 22:59:41.856233797 +0200
-+++ madwifi-ng-r2568-20070710/ath/if_ath.c	2007-07-11 22:59:42.416265710 +0200
+--- 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
 @@ -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 0230b2db47..cd4486f378 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 10:20:14.978836242 +0200
-+++ madwifi-ng-r2568-20070710/ath/if_ath_ahb.c	2007-07-13 10:21:25.106832611 +0200
+--- 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
 @@ -275,11 +275,10 @@
  
  
diff --git a/package/madwifi/patches/121-ibss_hostap.patch b/package/madwifi/patches/121-ibss_hostap.patch
index 9caf16b355..3a0004c3a6 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-11 22:59:42.416265710 +0200
-+++ madwifi-ng-r2568-20070710/ath/if_ath.c	2007-07-11 22:59:42.904293522 +0200
+--- 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
 @@ -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-11 22:59:38.760057354 +0200
-+++ madwifi-ng-r2568-20070710/ath/if_athvar.h	2007-07-11 22:59:42.904293522 +0200
+--- 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
 @@ -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-11 22:59:38.764057583 +0200
-+++ madwifi-ng-r2568-20070710/net80211/ieee80211_beacon.c	2007-07-11 22:59:42.932295119 +0200
+--- 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
 @@ -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-11 22:59:38.772058042 +0200
-+++ madwifi-ng-r2568-20070710/net80211/ieee80211_input.c	2007-07-11 22:59:42.956296485 +0200
+--- 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
 @@ -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-11 22:59:41.860234023 +0200
-+++ madwifi-ng-r2568-20070710/net80211/ieee80211_node.c	2007-07-11 22:59:43.008299449 +0200
+--- 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
 @@ -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 2d6f9224b0..0c376e7bac 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-11 22:59:38.668052115 +0200
-+++ madwifi-ng-r2568-20070710/net80211/ieee80211_linux.c	2007-07-11 22:59:43.336318141 +0200
+--- 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
 @@ -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 1e0dd7672c..6356b7f0c5 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-11 22:59:38.584047327 +0200
-+++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_ccmp.c	2007-07-11 22:59:43.580332047 +0200
+--- 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
 @@ -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 8f857e88e9..3b089957a5 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-11 22:59:42.904293522 +0200
-+++ madwifi-ng-r2568-20070710/ath/if_athvar.h	2007-07-11 22:59:43.812345272 +0200
+--- 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
 @@ -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 2f135c9b45..2ca624ffb7 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-12 21:15:09.998476392 +0200
-+++ madwifi-ng-r2568-20070710/ath/if_ath.c	2007-07-12 22:57:09.235191822 +0200
+--- 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
 @@ -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-12 21:15:44.080418612 +0200
-+++ madwifi-ng-r2568-20070710/net80211/ieee80211_wireless.c	2007-07-12 22:48:39.378136721 +0200
+--- 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
 @@ -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 c65efae032..ddf7d18517 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 09:14:14.721154018 +0200
-+++ madwifi-ng-r2568-20070710/ath/if_ath.c	2007-07-13 09:14:55.499477843 +0200
+--- 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
 @@ -5711,8 +5711,9 @@
  			/*
  			 * Reject error frames if we have no vaps that 
diff --git a/package/madwifi/patches/200-no_debug.patch b/package/madwifi/patches/200-no_debug.patch
index d3461166e0..051b1fdd6c 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-11 22:59:44.052358947 +0200
-+++ madwifi-ng-r2568-20070710/ath/if_ath.c	2007-07-11 22:59:44.300373081 +0200
+--- 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
 @@ -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-11 22:59:38.296030912 +0200
-+++ madwifi-ng-r2568-20070710/ath_rate/amrr/amrr.c	2007-07-11 22:59:44.304373307 +0200
+--- 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
 @@ -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-11 22:59:41.620220346 +0200
-+++ madwifi-ng-r2568-20070710/ath_rate/minstrel/minstrel.c	2007-07-11 22:59:44.320374218 +0200
+--- 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
 @@ -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-11 22:59:38.312031823 +0200
-+++ madwifi-ng-r2568-20070710/ath_rate/onoe/onoe.c	2007-07-11 22:59:44.336375133 +0200
+--- 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
 @@ -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-11 22:59:38.320032282 +0200
-+++ madwifi-ng-r2568-20070710/ath_rate/sample/sample.c	2007-07-11 22:59:44.352376045 +0200
+--- 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
 @@ -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-11 22:59:38.324032509 +0200
-+++ madwifi-ng-r2568-20070710/net80211/ieee80211_proto.c	2007-07-11 22:59:44.372377182 +0200
+--- 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
 @@ -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-11 22:59:38.332032964 +0200
-+++ madwifi-ng-r2568-20070710/net80211/ieee80211_var.h	2007-07-11 22:59:44.412379463 +0200
+--- 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
 @@ -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-11 22:59:40.348147859 +0200
-+++ madwifi-ng-r2568-20070710/tools/do_multi.c	2007-07-11 22:59:44.432380603 +0200
+--- 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
 @@ -9,16 +9,20 @@
  
      progname = basename(argv[0]);
@@ -125,8 +125,8 @@ 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-11 22:59:40.388150134 +0200
-+++ madwifi-ng-r2568-20070710/tools/Makefile	2007-07-11 22:59:44.448381515 +0200
+--- 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
 @@ -52,7 +52,7 @@
  	
  ifdef DOMULTI
diff --git a/package/madwifi/patches/300-napi_polling.patch b/package/madwifi/patches/300-napi_polling.patch
index e62a84515a..526cf1e169 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-11 22:59:44.300373081 +0200
-+++ madwifi-ng-r2568-20070710/ath/if_ath.c	2007-07-11 22:59:44.896407046 +0200
+--- 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
 @@ -170,7 +170,7 @@
  	int, u_int64_t);
  static void ath_setdefantenna(struct ath_softc *, u_int);
@@ -140,7 +140,7 @@ Index: madwifi-ng-r2568-20070710/ath/if_ath.c
  			}
  			if (rs->rs_status & HAL_RXERR_DECRYPT) {
  				/*
-@@ -5886,9 +5910,33 @@
+@@ -5887,9 +5911,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
  }
  
-@@ -7511,11 +7559,22 @@
+@@ -7512,11 +7560,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)
-@@ -7532,6 +7591,7 @@
+@@ -7533,6 +7592,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.
  	 */
-@@ -7552,6 +7612,16 @@
+@@ -7553,6 +7613,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)
-@@ -7569,6 +7639,7 @@
+@@ -7570,6 +7640,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]);
-@@ -7577,6 +7648,16 @@
+@@ -7578,6 +7649,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)
-@@ -7675,6 +7756,7 @@
+@@ -7676,6 +7757,7 @@
  ath_draintxq(struct ath_softc *sc)
  {
  	struct ath_hal *ah = sc->sc_ah;
@@ -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-11 22:59:43.812345272 +0200
-+++ madwifi-ng-r2568-20070710/ath/if_athvar.h	2007-07-11 22:59:44.896407046 +0200
+--- 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
 @@ -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-11 22:59:42.956296485 +0200
-+++ madwifi-ng-r2568-20070710/net80211/ieee80211_input.c	2007-07-11 22:59:44.916408186 +0200
+--- 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
 @@ -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 2bfc22e403..bdfecd8fa4 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-11 22:59:44.896407046 +0200
-+++ madwifi-ng-r2568-20070710/ath/if_ath.c	2007-07-11 22:59:45.332431894 +0200
+--- 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
 @@ -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-11 22:59:44.896407046 +0200
-+++ madwifi-ng-r2568-20070710/ath/if_athvar.h	2007-07-11 22:59:45.332431894 +0200
+--- 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
 @@ -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 71dcbdd103..ed8fc7619f 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-11 22:59:45.332431894 +0200
-+++ madwifi-ng-r2568-20070710/ath/if_ath.c	2007-07-11 22:59:45.608447623 +0200
+--- 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
 @@ -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-11 22:59:44.916408186 +0200
-+++ madwifi-ng-r2568-20070710/net80211/ieee80211_input.c	2007-07-11 22:59:45.608447623 +0200
+--- 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
 @@ -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-11 22:59:43.008299449 +0200
-+++ madwifi-ng-r2568-20070710/net80211/ieee80211_node.c	2007-07-11 22:59:45.632448994 +0200
+--- 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
 @@ -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-11 22:59:44.372377182 +0200
-+++ madwifi-ng-r2568-20070710/net80211/ieee80211_proto.c	2007-07-11 22:59:45.660450586 +0200
+--- 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
 @@ -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-11 22:59:44.412379463 +0200
-+++ madwifi-ng-r2568-20070710/net80211/ieee80211_var.h	2007-07-11 22:59:45.700452869 +0200
+--- 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
 @@ -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 b498aa0e8e..b58966f93b 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:14:06.322980052 +0200
-+++ madwifi-ng-r2568-20070710/ath/if_ath.c	2007-07-13 11:15:00.834086460 +0200
+--- 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
 @@ -153,6 +153,7 @@
  static void ath_turbo_switch_mode(unsigned long);
  static int ath_check_beacon_done(struct ath_softc *);
@@ -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:14:06.274977315 +0200
-+++ madwifi-ng-r2568-20070710/ath/if_athvar.h	2007-07-13 11:14:06.522991448 +0200
+--- 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
 @@ -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 b910282c63..2fa74cc027 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-11 22:59:45.608447623 +0200
-+++ madwifi-ng-r2568-20070710/ath/if_ath.c	2007-07-11 22:59:46.016470876 +0200
-@@ -5620,6 +5620,7 @@
+--- 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 @@
  	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));
-@@ -5714,25 +5715,7 @@
+@@ -5724,25 +5725,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 
-@@ -5796,8 +5779,9 @@
+@@ -5807,8 +5790,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;
-@@ -5828,6 +5812,27 @@
+@@ -5839,6 +5823,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-11 22:59:43.580332047 +0200
-+++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_ccmp.c	2007-07-11 22:59:46.020471102 +0200
+--- 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
 @@ -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-11 22:59:37.880007204 +0200
-+++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto.h	2007-07-11 22:59:46.060473383 +0200
+--- 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
 @@ -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-11 22:59:37.888007663 +0200
-+++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_none.c	2007-07-11 22:59:46.084474751 +0200
+--- 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
 @@ -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-11 22:59:37.896008115 +0200
-+++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_tkip.c	2007-07-11 22:59:46.112476346 +0200
+--- 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
 @@ -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-11 22:59:37.900008344 +0200
-+++ madwifi-ng-r2568-20070710/net80211/ieee80211_crypto_wep.c	2007-07-11 22:59:46.136477715 +0200
+--- 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
 @@ -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-11 22:59:45.608447623 +0200
-+++ madwifi-ng-r2568-20070710/net80211/ieee80211_input.c	2007-07-11 22:59:46.180480221 +0200
+--- 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
 @@ -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-11 22:59:37.916009256 +0200
-+++ madwifi-ng-r2568-20070710/net80211/ieee80211_proto.h	2007-07-11 22:59:46.204481592 +0200
+--- 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
 @@ -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-11 22:59:43.336318141 +0200
-+++ madwifi-ng-r2568-20070710/net80211/ieee80211_linux.c	2007-07-11 22:59:46.228482956 +0200
+--- 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
 @@ -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-11 22:59:37.928009938 +0200
-+++ madwifi-ng-r2568-20070710/net80211/ieee80211_output.c	2007-07-11 22:59:46.252484325 +0200
+--- 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
 @@ -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-11 22:59:45.632448994 +0200
-+++ madwifi-ng-r2568-20070710/net80211/ieee80211_node.c	2007-07-11 22:59:46.304487289 +0200
+--- 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
 @@ -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 1503a41481..974f5043f6 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-11 22:59:42.932295119 +0200
-+++ madwifi-ng-r2568-20070710/net80211/ieee80211_beacon.c	2007-07-11 22:59:46.676508490 +0200
+--- 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
 @@ -512,7 +512,7 @@
  			vap->iv_flags &= ~IEEE80211_F_XRUPDATE;
  		}