refresh patches, make madwifi-dfs compile on linux 2.4 again

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9719 3c298f89-4303-0410-b956-a3cf2f4a3e73
2024-12-24 07:01:44 +02:00 · 2007-12-13 04:26:55 +00:00 · 2007-12-13 04:26:55 +00:00 · 8bccd2e819
commit 8bccd2e819
parent 0a04de81c7
15 changed files with 421 additions and 204 deletions
--- a/package/madwifi/patches/100-kernel_cflags.patch
+++ b/package/madwifi/patches/100-kernel_cflags.patch
@ -1,7 +1,7 @@
-Index: madwifi-ng-r2834-20071106/hal/public/mips-be-elf.inc
+Index: madwifi-dfs-r3053/hal/public/mips-be-elf.inc
 ===================================================================
--- madwifi-ng-r2834-20071106.orig/hal/public/mips-be-elf.inc	2007-11-07 14:01:59.849362290 +0100
-+++ madwifi-ng-r2834-20071106/hal/public/mips-be-elf.inc	2007-11-07 14:01:59.941367534 +0100
+--- madwifi-dfs-r3053.orig/hal/public/mips-be-elf.inc	2007-12-13 05:25:10.890246068 +0100
+++ madwifi-dfs-r3053/hal/public/mips-be-elf.inc	2007-12-13 05:25:10.986251538 +0100
@@ -71,5 +71,5 @@
 
 LDOPTS=	-EB
@ -9,10 +9,10 @@ Index: madwifi-ng-r2834-20071106/hal/public/mips-be-elf.inc
 -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
-Index: madwifi-ng-r2834-20071106/hal/public/mips-le-elf.inc
+Index: madwifi-dfs-r3053/hal/public/mips-le-elf.inc
 ===================================================================
--- madwifi-ng-r2834-20071106.orig/hal/public/mips-le-elf.inc	2007-11-07 14:01:59.857362746 +0100
-+++ madwifi-ng-r2834-20071106/hal/public/mips-le-elf.inc	2007-11-07 14:01:59.949367989 +0100
+--- madwifi-dfs-r3053.orig/hal/public/mips-le-elf.inc	2007-12-13 05:25:10.898246523 +0100
+++ madwifi-dfs-r3053/hal/public/mips-le-elf.inc	2007-12-13 05:25:10.994251993 +0100
@@ -68,5 +68,5 @@
 
 LDOPTS=	-EL
@ -20,10 +20,10 @@ Index: madwifi-ng-r2834-20071106/hal/public/mips-le-elf.inc
 -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
-Index: madwifi-ng-r2834-20071106/hal/public/xscale-be-elf.inc
+Index: madwifi-dfs-r3053/hal/public/xscale-be-elf.inc
 ===================================================================
--- madwifi-ng-r2834-20071106.orig/hal/public/xscale-be-elf.inc	2007-11-07 14:01:59.865363201 +0100
-+++ madwifi-ng-r2834-20071106/hal/public/xscale-be-elf.inc	2007-11-07 14:01:59.953368219 +0100
+--- madwifi-dfs-r3053.orig/hal/public/xscale-be-elf.inc	2007-12-13 05:25:10.906246979 +0100
+++ madwifi-dfs-r3053/hal/public/xscale-be-elf.inc	2007-12-13 05:25:10.998252222 +0100
@@ -77,5 +77,5 @@
 
 LDOPTS=	-EB
--- a/package/madwifi/patches/102-multicall_binary.patch
+++ b/package/madwifi/patches/102-multicall_binary.patch
@ -1,7 +1,7 @@
-Index: madwifi-dfs-r3012/tools/80211debug.c
+Index: madwifi-dfs-r3053/tools/80211debug.c
 ===================================================================
--- madwifi-dfs-r3012.orig/tools/80211debug.c	2007-12-12 23:38:16.916125282 +0100
-+++ madwifi-dfs-r3012/tools/80211debug.c	2007-12-12 23:39:07.114985947 +0100
+--- madwifi-dfs-r3053.orig/tools/80211debug.c	2007-12-13 05:25:10.786240140 +0100
+++ madwifi-dfs-r3053/tools/80211debug.c	2007-12-13 05:25:11.226265215 +0100
@@ -49,6 +49,10 @@
 #include <getopt.h>
 #include <err.h>
@ -33,10 +33,10 @@ Index: madwifi-dfs-r3012/tools/80211debug.c
 	const char *ifname = "ath0";
 	const char *cp, *tp;
 	const char *sep;
-Index: madwifi-dfs-r3012/tools/80211stats.c
+Index: madwifi-dfs-r3053/tools/80211stats.c
 ===================================================================
--- madwifi-dfs-r3012.orig/tools/80211stats.c	2007-12-12 23:38:16.924125726 +0100
-+++ madwifi-dfs-r3012/tools/80211stats.c	2007-12-12 23:38:32.068988792 +0100
+--- madwifi-dfs-r3053.orig/tools/80211stats.c	2007-12-13 05:25:10.794240595 +0100
+++ madwifi-dfs-r3053/tools/80211stats.c	2007-12-13 05:25:11.226265215 +0100
@@ -60,6 +60,10 @@
 #include "net80211/ieee80211_crypto.h"
 #include "net80211/ieee80211_ioctl.h"
@ -68,10 +68,10 @@ Index: madwifi-dfs-r3012/tools/80211stats.c
 	int c, len;
 	struct ieee80211req_sta_info *si;
 	u_int8_t buf[24*1024], *cp;
-Index: madwifi-dfs-r3012/tools/athchans.c
+Index: madwifi-dfs-r3053/tools/athchans.c
 ===================================================================
--- madwifi-dfs-r3012.orig/tools/athchans.c	2007-12-12 23:38:16.932126191 +0100
-+++ madwifi-dfs-r3012/tools/athchans.c	2007-12-12 23:38:32.072989019 +0100
+--- madwifi-dfs-r3053.orig/tools/athchans.c	2007-12-13 05:25:10.798240825 +0100
+++ madwifi-dfs-r3053/tools/athchans.c	2007-12-13 05:25:11.238265900 +0100
@@ -59,6 +59,10 @@
 #include "net80211/ieee80211_crypto.h"
 #include "net80211/ieee80211_ioctl.h"
@ -104,10 +104,10 @@ Index: madwifi-dfs-r3012/tools/athchans.c
 	const char *ifname = "wifi0";
 	struct ieee80211req_chanlist chanlist;
 	int c;
-Index: madwifi-dfs-r3012/tools/athctrl.c
+Index: madwifi-dfs-r3053/tools/athctrl.c
 ===================================================================
--- madwifi-dfs-r3012.orig/tools/athctrl.c	2007-12-12 23:38:16.940126655 +0100
-+++ madwifi-dfs-r3012/tools/athctrl.c	2007-12-12 23:38:32.076989248 +0100
+--- madwifi-dfs-r3053.orig/tools/athctrl.c	2007-12-13 05:25:10.806241280 +0100
+++ madwifi-dfs-r3053/tools/athctrl.c	2007-12-13 05:25:11.242266126 +0100
@@ -53,6 +53,10 @@
 
 #include <net/if.h>
@ -139,10 +139,10 @@ Index: madwifi-dfs-r3012/tools/athctrl.c
 	char device[IFNAMSIZ + 1];
 	int distance = -1;
 	int c;
-Index: madwifi-dfs-r3012/tools/athdebug.c
+Index: madwifi-dfs-r3053/tools/athdebug.c
 ===================================================================
--- madwifi-dfs-r3012.orig/tools/athdebug.c	2007-12-12 23:38:16.944126879 +0100
-+++ madwifi-dfs-r3012/tools/athdebug.c	2007-12-12 23:39:24.779992618 +0100
+--- madwifi-dfs-r3053.orig/tools/athdebug.c	2007-12-13 05:25:10.814241735 +0100
+++ madwifi-dfs-r3053/tools/athdebug.c	2007-12-13 05:25:11.242266126 +0100
@@ -52,6 +52,10 @@
 #include <getopt.h>
 #include <err.h>
@ -175,10 +175,10 @@ Index: madwifi-dfs-r3012/tools/athdebug.c
 #ifdef __linux__
 	const char *ifname = "wifi0";
 #else
-Index: madwifi-dfs-r3012/tools/athkey.c
+Index: madwifi-dfs-r3053/tools/athkey.c
 ===================================================================
--- madwifi-dfs-r3012.orig/tools/athkey.c	2007-12-12 23:38:16.952127326 +0100
-+++ madwifi-dfs-r3012/tools/athkey.c	2007-12-12 23:38:32.080989474 +0100
+--- madwifi-dfs-r3053.orig/tools/athkey.c	2007-12-13 05:25:10.818241964 +0100
+++ madwifi-dfs-r3053/tools/athkey.c	2007-12-13 05:25:11.242266126 +0100
@@ -59,6 +59,10 @@
 #include "net80211/ieee80211_crypto.h"
 #include "net80211/ieee80211_ioctl.h"
@ -210,10 +210,10 @@ Index: madwifi-dfs-r3012/tools/athkey.c
 	const char *ifname = "wifi0";
 	struct ieee80211req_key setkey;
 	struct ieee80211req_del_key delkey;
-Index: madwifi-dfs-r3012/tools/athstats.c
+Index: madwifi-dfs-r3053/tools/athstats.c
 ===================================================================
--- madwifi-dfs-r3012.orig/tools/athstats.c	2007-12-12 23:38:16.960127784 +0100
-+++ madwifi-dfs-r3012/tools/athstats.c	2007-12-12 23:38:32.080989474 +0100
+--- madwifi-dfs-r3053.orig/tools/athstats.c	2007-12-13 05:25:10.826242419 +0100
+++ madwifi-dfs-r3053/tools/athstats.c	2007-12-13 05:25:11.242266126 +0100
@@ -66,6 +66,10 @@
 #undef ARRAY_SIZE
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
@ -246,10 +246,10 @@ Index: madwifi-dfs-r3012/tools/athstats.c
 #ifdef __linux__
 	const char *ifname = "wifi0";
 #else
-Index: madwifi-dfs-r3012/tools/do_multi.c
+Index: madwifi-dfs-r3053/tools/do_multi.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ madwifi-dfs-r3012/tools/do_multi.c	2007-12-12 23:38:32.080989474 +0100
+++ madwifi-dfs-r3053/tools/do_multi.c	2007-12-13 05:25:11.242266126 +0100
@@ -0,0 +1,32 @@
 +#include <string.h>
 +#include "do_multi.h"
@ -283,10 +283,10 @@ Index: madwifi-dfs-r3012/tools/do_multi.c
 +
 +    return ret;
 +}
-Index: madwifi-dfs-r3012/tools/do_multi.h
+Index: madwifi-dfs-r3053/tools/do_multi.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ madwifi-dfs-r3012/tools/do_multi.h	2007-12-12 23:38:32.084989703 +0100
+++ madwifi-dfs-r3053/tools/do_multi.h	2007-12-13 05:25:11.246266355 +0100
@@ -0,0 +1,10 @@
 +
 +int a80211debug_init(int argc, char *argv[]);
@ -298,10 +298,10 @@ Index: madwifi-dfs-r3012/tools/do_multi.h
 +int athstats_init(int argc, char *argv[]);
 +int wlanconfig_init(int argc, char *argv[]);
 +int athinfo_init(int argc, char *argv[]);
-Index: madwifi-dfs-r3012/tools/Makefile
+Index: madwifi-dfs-r3053/tools/Makefile
 ===================================================================
--- madwifi-dfs-r3012.orig/tools/Makefile	2007-12-12 23:38:16.976128701 +0100
-+++ madwifi-dfs-r3012/tools/Makefile	2007-12-12 23:38:32.084989703 +0100
+--- madwifi-dfs-r3053.orig/tools/Makefile	2007-12-13 05:25:10.842243330 +0100
+++ madwifi-dfs-r3053/tools/Makefile	2007-12-13 05:25:11.246266355 +0100
@@ -47,9 +47,12 @@
 endif
 
@ -367,10 +367,10 @@ Index: madwifi-dfs-r3012/tools/Makefile
 
 install: $(ALL) 
 	install -d $(DESTDIR)$(BINDIR)
-Index: madwifi-dfs-r3012/tools/wlanconfig.c
+Index: madwifi-dfs-r3053/tools/wlanconfig.c
 ===================================================================
--- madwifi-dfs-r3012.orig/tools/wlanconfig.c	2007-12-12 23:38:16.984129146 +0100
-+++ madwifi-dfs-r3012/tools/wlanconfig.c	2007-12-12 23:38:32.084989703 +0100
+--- madwifi-dfs-r3053.orig/tools/wlanconfig.c	2007-12-13 05:25:10.850243788 +0100
+++ madwifi-dfs-r3053/tools/wlanconfig.c	2007-12-13 05:25:11.246266355 +0100
@@ -62,6 +62,10 @@
 #include "net80211/ieee80211_crypto.h"
 #include "net80211/ieee80211_ioctl.h"
@ -402,10 +402,10 @@ Index: madwifi-dfs-r3012/tools/wlanconfig.c
 	const char *ifname, *cmd;
 	unsigned char bnounit = 0;
 	char *if_base = NULL;
-Index: madwifi-dfs-r3012/tools/ath_info.c
+Index: madwifi-dfs-r3053/tools/ath_info.c
 ===================================================================
--- madwifi-dfs-r3012.orig/tools/ath_info.c	2007-12-12 23:38:16.992129610 +0100
-+++ madwifi-dfs-r3012/tools/ath_info.c	2007-12-12 23:38:32.084989703 +0100
+--- madwifi-dfs-r3053.orig/tools/ath_info.c	2007-12-13 05:25:10.858244244 +0100
+++ madwifi-dfs-r3053/tools/ath_info.c	2007-12-13 05:25:11.246266355 +0100
@@ -738,7 +738,12 @@
 		"unlawful radio transmissions!\n\n");
 }
--- a/package/madwifi/patches/104-autocreate_none.patch
+++ b/package/madwifi/patches/104-autocreate_none.patch
@ -1,8 +1,8 @@
-Index: madwifi-ng-r2834-20071106/ath/if_ath.c
+Index: madwifi-dfs-r3053/ath/if_ath.c
 ===================================================================
--- madwifi-ng-r2834-20071106.orig/ath/if_ath.c	2007-11-07 14:01:59.713354541 +0100
-+++ madwifi-ng-r2834-20071106/ath/if_ath.c	2007-11-07 14:02:00.533401273 +0100
-@@ -426,7 +426,7 @@
+--- madwifi-dfs-r3053.orig/ath/if_ath.c	2007-12-13 05:25:10.754238316 +0100
+++ madwifi-dfs-r3053/ath/if_ath.c	2007-12-13 05:25:11.582285503 +0100
+@@ -512,7 +512,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,7 +1,7 @@
-Index: madwifi-ng-r2834-20071106/net80211/ieee80211_rate.c
+Index: madwifi-dfs-r3053/net80211/ieee80211_rate.c
 ===================================================================
--- madwifi-ng-r2834-20071106.orig/net80211/ieee80211_rate.c	2007-11-07 14:01:59.685352943 +0100
-+++ madwifi-ng-r2834-20071106/net80211/ieee80211_rate.c	2007-11-07 14:02:00.745413352 +0100
+--- madwifi-dfs-r3053.orig/net80211/ieee80211_rate.c	2007-12-13 05:25:10.722236492 +0100
+++ madwifi-dfs-r3053/net80211/ieee80211_rate.c	2007-12-13 05:25:11.798297814 +0100
@@ -100,8 +100,18 @@
 		ieee80211_load_module(buf);
 
--- a/package/madwifi/patches/111-minstrel_crash.patch
+++ b/package/madwifi/patches/111-minstrel_crash.patch
@ -1,7 +1,7 @@
-Index: madwifi-ng-r2834-20071106/ath_rate/minstrel/minstrel.c
+Index: madwifi-dfs-r3053/ath_rate/minstrel/minstrel.c
 ===================================================================
--- madwifi-ng-r2834-20071106.orig/ath_rate/minstrel/minstrel.c	2007-11-07 14:01:59.625349524 +0100
-+++ madwifi-ng-r2834-20071106/ath_rate/minstrel/minstrel.c	2007-11-07 14:02:01.169437517 +0100
+--- madwifi-dfs-r3053.orig/ath_rate/minstrel/minstrel.c	2007-12-13 05:25:10.690234670 +0100
+++ madwifi-dfs-r3053/ath_rate/minstrel/minstrel.c	2007-12-13 05:25:12.006309667 +0100
@@ -393,6 +393,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 */
--- 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-r2834-20071106/net80211/ieee80211_scan.c
+Index: madwifi-dfs-r3053/net80211/ieee80211_scan.c
 ===================================================================
--- madwifi-ng-r2834-20071106.orig/net80211/ieee80211_scan.c	2007-11-07 14:01:59.541344736 +0100
-+++ madwifi-ng-r2834-20071106/net80211/ieee80211_scan.c	2007-11-07 14:02:02.281500890 +0100
+--- madwifi-dfs-r3053.orig/net80211/ieee80211_scan.c	2007-12-13 05:25:10.658232846 +0100
+++ madwifi-dfs-r3053/net80211/ieee80211_scan.c	2007-12-13 05:25:12.214321521 +0100
@@ -291,7 +291,8 @@
 	struct ieee80211com *ic = vap->iv_ic;
 	int delay;
--- a/package/madwifi/patches/122-replayfail_workaround.patch
+++ b/package/madwifi/patches/122-replayfail_workaround.patch
@ -1,8 +1,8 @@
-Index: madwifi-ng-r2834-20071106/net80211/ieee80211_linux.c
+Index: madwifi-dfs-r3053/net80211/ieee80211_linux.c
 ===================================================================
--- madwifi-ng-r2834-20071106.orig/net80211/ieee80211_linux.c	2007-11-07 14:01:59.417337671 +0100
-+++ madwifi-ng-r2834-20071106/net80211/ieee80211_linux.c	2007-11-07 14:02:03.137549672 +0100
-@@ -333,6 +333,9 @@
+--- madwifi-dfs-r3053.orig/net80211/ieee80211_linux.c	2007-12-13 05:25:10.626231021 +0100
+++ madwifi-dfs-r3053/net80211/ieee80211_linux.c	2007-12-13 05:25:12.422333377 +0100
+@@ -331,6 +331,9 @@
 		k->wk_cipher->ic_name, k->wk_keyix,
 		(unsigned long long)rsc );
 
--- a/package/madwifi/patches/123-ccmp_checks.patch
+++ b/package/madwifi/patches/123-ccmp_checks.patch
@ -1,7 +1,7 @@
-Index: madwifi-ng-r2834-20071106/net80211/ieee80211_crypto_ccmp.c
+Index: madwifi-dfs-r3053/net80211/ieee80211_crypto_ccmp.c
 ===================================================================
--- madwifi-ng-r2834-20071106.orig/net80211/ieee80211_crypto_ccmp.c	2007-11-07 14:01:59.385335846 +0100
-+++ madwifi-ng-r2834-20071106/net80211/ieee80211_crypto_ccmp.c	2007-11-07 14:02:03.345561529 +0100
+--- madwifi-dfs-r3053.orig/net80211/ieee80211_crypto_ccmp.c	2007-12-13 05:25:10.594229197 +0100
+++ madwifi-dfs-r3053/net80211/ieee80211_crypto_ccmp.c	2007-12-13 05:25:12.634345457 +0100
@@ -475,6 +475,9 @@
 	uint8_t *mic, *pos;
 	u_int space;
--- a/package/madwifi/patches/124-linux24_compat.patch
+++ b/package/madwifi/patches/124-linux24_compat.patch
@ -1,7 +1,7 @@
-Index: madwifi-ng-r2834-20071106/ath/if_athvar.h
+Index: madwifi-dfs-r3053/ath/if_athvar.h
 ===================================================================
--- madwifi-ng-r2834-20071106.orig/ath/if_athvar.h	2007-11-07 14:02:02.861533944 +0100
-+++ madwifi-ng-r2834-20071106/ath/if_athvar.h	2007-11-07 14:02:03.557573608 +0100
+--- madwifi-dfs-r3053.orig/ath/if_athvar.h	2007-12-13 05:25:10.534225778 +0100
+++ madwifi-dfs-r3053/ath/if_athvar.h	2007-12-13 05:25:12.842357313 +0100
@@ -128,6 +128,11 @@
 #define	NETDEV_TX_BUSY	1
 #endif
@ -14,3 +14,220 @@ Index: madwifi-ng-r2834-20071106/ath/if_athvar.h
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,23)
 static inline struct net_device *_alloc_netdev(int sizeof_priv, const char *mask,
 					       void (*setup)(struct net_device *))
+Index: madwifi-dfs-r3053/ath/if_ath_radar.c
+===================================================================
+--- madwifi-dfs-r3053.orig/ath/if_ath_radar.c	2007-12-13 05:25:10.538226007 +0100
+++ madwifi-dfs-r3053/ath/if_ath_radar.c	2007-12-13 05:25:12.850357768 +0100
+@@ -92,6 +92,13 @@
+ #define nofloat_pct(_value, _pct) \
+ 	( (_value * (1000 + _pct)) / 1000 )
+ 
+#ifndef list_for_each_entry_reverse
+#define list_for_each_entry_reverse(pos, head, member)			\
+	for (pos = list_entry((head)->prev, typeof(*pos), member);	\
+	     prefetch(pos->member.prev), &pos->member != (head); 	\
+	     pos = list_entry(pos->member.prev, typeof(*pos), member))
+#endif
+
+ struct radar_pattern_specification {
+ 	/* The name of the rule/specification (i.e. what did we detect) */
+ 	const char *name;
+Index: madwifi-dfs-r3053/ath/if_ath.c
+===================================================================
+--- madwifi-dfs-r3053.orig/ath/if_ath.c	2007-12-13 05:25:11.582285503 +0100
+++ madwifi-dfs-r3053/ath/if_ath.c	2007-12-13 05:25:12.854357994 +0100
+@@ -4595,6 +4595,46 @@
+ #undef USE_SHPREAMBLE
+ }
+ 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)
+static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
+{
+	int ret;
+	unsigned long flags;
+
+	local_irq_save(flags);
+	ret = v->counter;
+	if (likely(ret == old))
+		v->counter = new;
+	local_irq_restore(flags);
+
+	return ret;
+}
+
+/**
+ * atomic_add_unless - add unless the number is a given value
+ * @v: pointer of type atomic_t
+ * @a: the amount to add to v...
+ * @u: ...unless v is equal to u.
+ *
+ * Atomically adds @a to @v, so long as it was not @u.
+ * Returns non-zero if @v was not @u, and zero otherwise.
+ */
+static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
+{
+	int c, old;
+	c = atomic_read(v);
+	for (;;) {
+		if (unlikely(c == (u)))
+			break;
+		old = atomic_cmpxchg((v), c, c + (a));
+		if (likely(old == c))
+			break;
+		c = old;
+	}
+	return c != (u);
+}
+#endif
+
+ /*
+  * Generate beacon frame and queue cab data for a VAP.
+  */
+Index: madwifi-dfs-r3053/net80211/ieee80211_scan_ap.c
+===================================================================
+--- madwifi-dfs-r3053.orig/net80211/ieee80211_scan_ap.c	2007-12-13 05:25:10.554226918 +0100
+++ madwifi-dfs-r3053/net80211/ieee80211_scan_ap.c	2007-12-13 05:25:12.858358223 +0100
+@@ -46,12 +46,16 @@
+ #include <linux/netdevice.h>
+ #include <linux/init.h>
+ #include <linux/delay.h>
+-#include <linux/sort.h>
+-
+ #include "if_media.h"
+ 
+ #include <net80211/ieee80211_var.h>
+ 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11)
+#include "sort.c"
+#else
+#include <linux/sort.h>
+#endif
+
+ #define	AP_PURGE_SCANS	2		/* age for purging entries (scans) */
+ #define RSSI_LPF_LEN	10
+ #define	RSSI_EP_MULTIPLIER	(1<<7)	/* pow2 to optimize out * and / */
+Index: madwifi-dfs-r3053/net80211/sort.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ madwifi-dfs-r3053/net80211/sort.c	2007-12-13 05:25:12.862358452 +0100
+@@ -0,0 +1,120 @@
+/*
+ * A fast, small, non-recursive O(nlog n) sort for the Linux kernel
+ *
+ * Jan 23 2005  Matt Mackall <mpm@selenic.com>
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+
+static void u32_swap(void *a, void *b, int size)
+{
+	u32 t = *(u32 *)a;
+	*(u32 *)a = *(u32 *)b;
+	*(u32 *)b = t;
+}
+
+static void generic_swap(void *a, void *b, int size)
+{
+	char t;
+
+	do {
+		t = *(char *)a;
+		*(char *)a++ = *(char *)b;
+		*(char *)b++ = t;
+	} while (--size > 0);
+}
+
+/**
+ * sort - sort an array of elements
+ * @base: pointer to data to sort
+ * @num: number of elements
+ * @size: size of each element
+ * @cmp: pointer to comparison function
+ * @swap: pointer to swap function or NULL
+ *
+ * This function does a heapsort on the given array. You may provide a
+ * swap function optimized to your element type.
+ *
+ * Sorting time is O(n log n) both on average and worst-case. While
+ * qsort is about 20% faster on average, it suffers from exploitable
+ * O(n*n) worst-case behavior and extra memory requirements that make
+ * it less suitable for kernel use.
+ */
+
+static void sort(void *base, size_t num, size_t size,
+	  int (*cmp)(const void *, const void *),
+	  void (*swap)(void *, void *, int size))
+{
+	/* pre-scale counters for performance */
+	int i = (num/2 - 1) * size, n = num * size, c, r;
+
+	if (!swap)
+		swap = (size == 4 ? u32_swap : generic_swap);
+
+	/* heapify */
+	for ( ; i >= 0; i -= size) {
+		for (r = i; r * 2 + size < n; r  = c) {
+			c = r * 2 + size;
+			if (c < n - size && cmp(base + c, base + c + size) < 0)
+				c += size;
+			if (cmp(base + r, base + c) >= 0)
+				break;
+			swap(base + r, base + c, size);
+		}
+	}
+
+	/* sort */
+	for (i = n - size; i >= 0; i -= size) {
+		swap(base, base + i, size);
+		for (r = 0; r * 2 + size < i; r = c) {
+			c = r * 2 + size;
+			if (c < i - size && cmp(base + c, base + c + size) < 0)
+				c += size;
+			if (cmp(base + r, base + c) >= 0)
+				break;
+			swap(base + r, base + c, size);
+		}
+	}
+}
+
+EXPORT_SYMBOL(sort);
+
+#if 0
+/* a simple boot-time regression test */
+
+int cmpint(const void *a, const void *b)
+{
+	return *(int *)a - *(int *)b;
+}
+
+static int sort_test(void)
+{
+	int *a, i, r = 1;
+
+	a = kmalloc(1000 * sizeof(int), GFP_KERNEL);
+	BUG_ON(!a);
+
+	printk("testing sort()\n");
+
+	for (i = 0; i < 1000; i++) {
+		r = (r * 725861) % 6599;
+		a[i] = r;
+	}
+
+	sort(a, 1000, sizeof(int), cmpint, NULL);
+
+	for (i = 0; i < 999; i++)
+		if (a[i] > a[i+1]) {
+			printk("sort() failed!\n");
+			break;
+		}
+
+	kfree(a);
+
+	return 0;
+}
+
+module_init(sort_test);
+#endif
--- a/package/madwifi/patches/126-rxerr_frames.patch
+++ b/package/madwifi/patches/126-rxerr_frames.patch
@ -1,10 +1,10 @@
-Index: madwifi-ng-r2834-20071106/ath/if_ath.c
+Index: madwifi-dfs-r3053/ath/if_ath.c
 ===================================================================
--- madwifi-ng-r2834-20071106.orig/ath/if_ath.c	2007-11-07 14:02:02.861533944 +0100
-+++ madwifi-ng-r2834-20071106/ath/if_ath.c	2007-11-07 14:02:03.853590479 +0100
-@@ -5834,8 +5834,9 @@
+--- madwifi-dfs-r3053.orig/ath/if_ath.c	2007-12-13 05:25:12.854357994 +0100
+++ madwifi-dfs-r3053/ath/if_ath.c	2007-12-13 05:25:13.122373270 +0100
+@@ -6410,8 +6410,9 @@
 			/*
- 			 * Reject error frames if we have no vaps that 
+ 			 * Reject error frames if we have no vaps that
 			 * are operating in monitor mode.
 +			 * Reject empty frames as well
 			 */
--- a/package/madwifi/patches/200-no_debug.patch
+++ b/package/madwifi/patches/200-no_debug.patch
@ -1,7 +1,7 @@
-Index: madwifi-dfs-r2996/ath/if_ath.c
+Index: madwifi-dfs-r3053/ath/if_ath.c
 ===================================================================
--- madwifi-dfs-r2996.orig/ath/if_ath.c	2007-12-01 18:53:03.204271791 +0100
-+++ madwifi-dfs-r2996/ath/if_ath.c	2007-12-01 18:53:28.557716602 +0100
+--- madwifi-dfs-r3053.orig/ath/if_ath.c	2007-12-13 05:25:13.122373270 +0100
+++ madwifi-dfs-r3053/ath/if_ath.c	2007-12-13 05:25:13.342385808 +0100
@@ -42,7 +42,7 @@
  * This software is derived from work of Atsushi Onoe; his contribution
  * is greatly appreciated.
@ -11,7 +11,7 @@ Index: madwifi-dfs-r2996/ath/if_ath.c
 #include "if_ath_debug.h"
 #include "opt_ah.h"
 
-@@ -515,9 +515,11 @@
+@@ -516,9 +516,11 @@
 	u_int8_t csz;
 
 	sc->devid = devid;
@ -23,7 +23,7 @@ Index: madwifi-dfs-r2996/ath/if_ath.c
 
 	/*
 	 * Cache line size is used to size and align various
-@@ -1283,12 +1285,14 @@
+@@ -1280,12 +1282,14 @@
 		/* If no default VAP debug flags are passed, allow a few to
 		 * transfer down from the driver to new VAPs so we can have load
 		 * time debugging for VAPs too. */
@ -38,7 +38,7 @@ Index: madwifi-dfs-r2996/ath/if_ath.c
 	}
 	ic->ic_debug = (sc->sc_default_ieee80211_debug & IEEE80211_MSG_IC);
 
-@@ -10290,9 +10294,11 @@
+@@ -10308,9 +10312,11 @@
 				/* XXX validate? */
 				sc->sc_ledpin = val;
 				break;
@ -50,7 +50,7 @@ Index: madwifi-dfs-r2996/ath/if_ath.c
 				break;
 			case ATH_TXANTENNA:
 				/*
-@@ -10703,9 +10709,11 @@
+@@ -10721,9 +10727,11 @@
 	}
 
 	/* initialize values */
@ -62,10 +62,10 @@ Index: madwifi-dfs-r2996/ath/if_ath.c
 	sc->sc_txantenna = 0;		/* default to auto-selection */
 	sc->sc_txintrperiod = ATH_TXQ_INTR_PERIOD;
 }
-Index: madwifi-dfs-r2996/ath_rate/amrr/amrr.c
+Index: madwifi-dfs-r3053/ath_rate/amrr/amrr.c
 ===================================================================
--- madwifi-dfs-r2996.orig/ath_rate/amrr/amrr.c	2007-12-01 18:45:14.000000000 +0100
-+++ madwifi-dfs-r2996/ath_rate/amrr/amrr.c	2007-12-01 18:53:06.076435466 +0100
+--- madwifi-dfs-r3053.orig/ath_rate/amrr/amrr.c	2007-12-13 05:25:10.422219395 +0100
+++ madwifi-dfs-r3053/ath_rate/amrr/amrr.c	2007-12-13 05:25:13.342385808 +0100
@@ -70,7 +70,7 @@
 
 #include "amrr.h"
@ -75,10 +75,10 @@ Index: madwifi-dfs-r2996/ath_rate/amrr/amrr.c
 #ifdef AMRR_DEBUG
 #define	DPRINTF(sc, _fmt, ...) do {					\
 	if (sc->sc_debug & 0x10)					\
-Index: madwifi-dfs-r2996/ath_rate/minstrel/minstrel.c
+Index: madwifi-dfs-r3053/ath_rate/minstrel/minstrel.c
 ===================================================================
--- madwifi-dfs-r2996.orig/ath_rate/minstrel/minstrel.c	2007-12-01 18:47:14.336390946 +0100
-+++ madwifi-dfs-r2996/ath_rate/minstrel/minstrel.c	2007-12-01 18:53:06.080435695 +0100
+--- madwifi-dfs-r3053.orig/ath_rate/minstrel/minstrel.c	2007-12-13 05:25:12.006309667 +0100
+++ madwifi-dfs-r3053/ath_rate/minstrel/minstrel.c	2007-12-13 05:25:13.350386263 +0100
@@ -117,7 +117,7 @@
 
 #include "minstrel.h"
@ -88,10 +88,10 @@ Index: madwifi-dfs-r2996/ath_rate/minstrel/minstrel.c
 #ifdef MINSTREL_DEBUG
 enum {
 		ATH_DEBUG_RATE		= 0x00000010	/* rate control */
-Index: madwifi-dfs-r2996/ath_rate/onoe/onoe.c
+Index: madwifi-dfs-r3053/ath_rate/onoe/onoe.c
 ===================================================================
--- madwifi-dfs-r2996.orig/ath_rate/onoe/onoe.c	2007-12-01 18:45:14.000000000 +0100
-+++ madwifi-dfs-r2996/ath_rate/onoe/onoe.c	2007-12-01 18:53:06.080435695 +0100
+--- madwifi-dfs-r3053.orig/ath_rate/onoe/onoe.c	2007-12-13 05:25:10.438220308 +0100
+++ madwifi-dfs-r3053/ath_rate/onoe/onoe.c	2007-12-13 05:25:13.354386489 +0100
@@ -66,7 +66,7 @@
 
 #include "onoe.h"
@ -101,10 +101,10 @@ Index: madwifi-dfs-r2996/ath_rate/onoe/onoe.c
 #ifdef ONOE_DEBUG
 enum {
 	ATH_DEBUG_RATE	= 0x00000010,	/* rate control */
-Index: madwifi-dfs-r2996/ath_rate/sample/sample.c
+Index: madwifi-dfs-r3053/ath_rate/sample/sample.c
 ===================================================================
--- madwifi-dfs-r2996.orig/ath_rate/sample/sample.c	2007-12-01 18:45:14.000000000 +0100
-+++ madwifi-dfs-r2996/ath_rate/sample/sample.c	2007-12-01 18:53:06.080435695 +0100
+--- madwifi-dfs-r3053.orig/ath_rate/sample/sample.c	2007-12-13 05:25:10.446220763 +0100
+++ madwifi-dfs-r3053/ath_rate/sample/sample.c	2007-12-13 05:25:13.358386718 +0100
@@ -68,7 +68,7 @@
 
 #include "sample.h"
@ -114,10 +114,10 @@ Index: madwifi-dfs-r2996/ath_rate/sample/sample.c
 #ifdef SAMPLE_DEBUG
 enum {
 	ATH_DEBUG_RATE		= 0x00000010,	/* rate control */
-Index: madwifi-dfs-r2996/tools/do_multi.c
+Index: madwifi-dfs-r3053/tools/do_multi.c
 ===================================================================
--- madwifi-dfs-r2996.orig/tools/do_multi.c	2007-12-01 18:45:51.063645501 +0100
-+++ madwifi-dfs-r2996/tools/do_multi.c	2007-12-01 18:53:06.080435695 +0100
+--- madwifi-dfs-r3053.orig/tools/do_multi.c	2007-12-13 05:25:11.242266126 +0100
+++ madwifi-dfs-r3053/tools/do_multi.c	2007-12-13 05:25:13.362386947 +0100
@@ -9,16 +9,20 @@
 
     progname = basename(argv[0]);
@ -139,10 +139,10 @@ Index: madwifi-dfs-r2996/tools/do_multi.c
     if(strcmp(progname, "athkey") == 0)
 	ret =  athkey_init(argc, argv);
     if(strcmp(progname, "athstats") == 0)
-Index: madwifi-dfs-r2996/tools/Makefile
+Index: madwifi-dfs-r3053/tools/Makefile
 ===================================================================
--- madwifi-dfs-r2996.orig/tools/Makefile	2007-12-01 18:45:51.067645730 +0100
-+++ madwifi-dfs-r2996/tools/Makefile	2007-12-01 18:53:06.084435926 +0100
+--- madwifi-dfs-r3053.orig/tools/Makefile	2007-12-13 05:25:11.246266355 +0100
+++ madwifi-dfs-r3053/tools/Makefile	2007-12-13 05:25:13.362386947 +0100
@@ -48,7 +48,7 @@
 
 
@ -161,10 +161,10 @@ Index: madwifi-dfs-r2996/tools/Makefile
 	ln -s -f madwifi_multi $$i; \
 	done
 
-Index: madwifi-dfs-r2996/net80211/ieee80211_linux.h
+Index: madwifi-dfs-r3053/net80211/ieee80211_linux.h
 ===================================================================
--- madwifi-dfs-r2996.orig/net80211/ieee80211_linux.h	2007-12-01 18:45:14.000000000 +0100
-+++ madwifi-dfs-r2996/net80211/ieee80211_linux.h	2007-12-01 18:53:06.084435926 +0100
+--- madwifi-dfs-r3053.orig/net80211/ieee80211_linux.h	2007-12-13 05:25:10.470222132 +0100
+++ madwifi-dfs-r3053/net80211/ieee80211_linux.h	2007-12-13 05:25:13.362386947 +0100
@@ -29,8 +29,8 @@
 #ifndef _NET80211_IEEE80211_LINUX_H_
 #define _NET80211_IEEE80211_LINUX_H_
--- a/package/madwifi/patches/300-napi_polling.patch
+++ b/package/madwifi/patches/300-napi_polling.patch
@ -1,7 +1,7 @@
-Index: madwifi-dfs-r2996/ath/if_ath.c
+Index: madwifi-dfs-r3053/ath/if_ath.c
 ===================================================================
--- madwifi-dfs-r2996.orig/ath/if_ath.c	2007-12-01 18:53:28.557716602 +0100
-+++ madwifi-dfs-r2996/ath/if_ath.c	2007-12-01 18:54:22.276777879 +0100
+--- madwifi-dfs-r3053.orig/ath/if_ath.c	2007-12-13 05:25:13.342385808 +0100
+++ madwifi-dfs-r3053/ath/if_ath.c	2007-12-13 05:25:13.662404044 +0100
@@ -189,7 +189,7 @@
 	struct sk_buff *, int, int, u_int64_t);
 static void ath_setdefantenna(struct ath_softc *, u_int);
@ -11,7 +11,7 @@ Index: madwifi-dfs-r2996/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
-@@ -534,7 +534,6 @@
+@@ -535,7 +535,6 @@
 	ATH_TXBUF_LOCK_INIT(sc);
 	ATH_RXBUF_LOCK_INIT(sc);
 
@ -19,7 +19,7 @@ Index: madwifi-dfs-r2996/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);
-@@ -807,6 +806,8 @@
+@@ -808,6 +807,8 @@
 	dev->set_mac_address = ath_set_mac_address;
 	dev->change_mtu = ath_change_mtu;
 	dev->tx_queue_len = ATH_TXBUF - ATH_TXBUF_MGT_RESERVED;
@ -28,7 +28,7 @@ Index: madwifi-dfs-r2996/ath/if_ath.c
 #ifdef USE_HEADERLEN_RESV
 	dev->hard_header_len += sizeof(struct ieee80211_qosframe) +
 				sizeof(struct llc) +
-@@ -2164,6 +2165,7 @@
+@@ -2150,6 +2151,7 @@
 		(status & HAL_INT_RXPHY)   ? " HAL_INT_RXPHY"   : "",
 		(status & HAL_INT_SWBA)    ? " HAL_INT_SWBA"    : "");
 
@ -36,7 +36,7 @@ Index: madwifi-dfs-r2996/ath/if_ath.c
 	status &= sc->sc_imask;			/* discard unasked for bits */
 	if (status & HAL_INT_FATAL) {
 		sc->sc_stats.ast_hardware++;
-@@ -2216,7 +2218,14 @@
+@@ -2201,7 +2203,14 @@
 		}
 		if (status & (HAL_INT_RX | HAL_INT_RXPHY)) {
 			ath_uapsd_processtriggers(sc);
@ -52,7 +52,7 @@ Index: madwifi-dfs-r2996/ath/if_ath.c
 		}
 		if (status & HAL_INT_TX) {
 #ifdef ATH_SUPERG_DYNTURBO
-@@ -2242,6 +2251,11 @@
+@@ -2227,6 +2236,11 @@
 				}
 			}
 #endif
@ -64,7 +64,7 @@ Index: madwifi-dfs-r2996/ath/if_ath.c
 			ATH_SCHEDULE_TQUEUE(&sc->sc_txtq, &needmark);
 		}
 		if (status & HAL_INT_BMISS) {
-@@ -3929,10 +3943,10 @@
+@@ -3904,10 +3918,10 @@
 	 *
 	 * XXX Using in_softirq is not right since we might
 	 * be called from other soft irq contexts than
@ -77,7 +77,7 @@ Index: madwifi-dfs-r2996/ath/if_ath.c
 	netif_stop_queue(dev);
 }
 
-@@ -3945,7 +3959,7 @@
+@@ -3920,7 +3934,7 @@
 	DPRINTF(sc, ATH_DEBUG_KEYCACHE, "%s:\n", __func__);
 	netif_start_queue(dev);
 	if (!in_softirq())		/* NB: see above */
@ -86,7 +86,7 @@ Index: madwifi-dfs-r2996/ath/if_ath.c
 }
 
 /*
-@@ -6252,13 +6266,12 @@
+@@ -6287,13 +6301,12 @@
 	sc->sc_rxotherant = 0;
 }
 
@ -102,7 +102,7 @@ Index: madwifi-dfs-r2996/ath/if_ath.c
 	struct ath_buf *bf;
 	struct ath_softc *sc = dev->priv;
 	struct ieee80211com *ic = &sc->sc_ic;
-@@ -6270,8 +6283,11 @@
+@@ -6305,8 +6318,11 @@
 	unsigned int len;
 	int type;
 	u_int phyerr;
@ -114,7 +114,7 @@ Index: madwifi-dfs-r2996/ath/if_ath.c
 	do {
 		bf = STAILQ_FIRST(&sc->sc_rxbuf);
 		if (bf == NULL) {		/* XXX ??? can this happen */
-@@ -6295,6 +6311,13 @@
+@@ -6330,6 +6346,13 @@
 			/* NB: never process the self-linked entry at the end */
 			break;
 		}
@ -128,7 +128,7 @@ Index: madwifi-dfs-r2996/ath/if_ath.c
 		skb = bf->bf_skb;
 		if (skb == NULL) {
 			printk("%s: no skbuff (%s)\n", DEV_NAME(dev), __func__);
-@@ -6339,6 +6362,7 @@
+@@ -6374,6 +6397,7 @@
 				sc->sc_stats.ast_rx_phyerr++;
 				phyerr = rs->rs_phyerr & 0x1f;
 				sc->sc_stats.ast_rx_phy[phyerr]++;
@ -136,7 +136,7 @@ Index: madwifi-dfs-r2996/ath/if_ath.c
 			}
 			if (rs->rs_status & HAL_RXERR_DECRYPT) {
 				/*
-@@ -6545,9 +6569,33 @@
+@@ -6571,9 +6595,33 @@
 		STAILQ_INSERT_TAIL(&sc->sc_rxbuf, bf, bf_list);
 		ATH_RXBUF_UNLOCK_IRQ(sc);
 	} while (ath_rxbuf_init(sc, bf) == 0);
@ -170,7 +170,7 @@ Index: madwifi-dfs-r2996/ath/if_ath.c
 #undef PA2DESC
 }
 
-@@ -8170,11 +8218,22 @@
+@@ -8192,11 +8240,22 @@
 	struct net_device *dev = (struct net_device *)data;
 	struct ath_softc *sc = dev->priv;
 
@ -193,7 +193,7 @@ Index: madwifi-dfs-r2996/ath/if_ath.c
 	netif_wake_queue(dev);
 
 	if (sc->sc_softled)
-@@ -8191,6 +8250,7 @@
+@@ -8213,6 +8272,7 @@
 	struct net_device *dev = (struct net_device *)data;
 	struct ath_softc *sc = dev->priv;
 
@ -201,7 +201,7 @@ Index: madwifi-dfs-r2996/ath/if_ath.c
 	/*
 	 * Process each active queue.
 	 */
-@@ -8211,6 +8271,16 @@
+@@ -8233,6 +8293,16 @@
 	if (sc->sc_uapsdq && txqactive(sc->sc_ah, sc->sc_uapsdq->axq_qnum))
 		ath_tx_processq(sc, sc->sc_uapsdq);
 
@ -218,7 +218,7 @@ Index: madwifi-dfs-r2996/ath/if_ath.c
 	netif_wake_queue(dev);
 
 	if (sc->sc_softled)
-@@ -8228,6 +8298,7 @@
+@@ -8250,6 +8320,7 @@
 	unsigned int i;
 
 	/* Process each active queue. */
@ -226,7 +226,7 @@ Index: madwifi-dfs-r2996/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]);
-@@ -8236,6 +8307,16 @@
+@@ -8258,6 +8329,16 @@
 		ath_tx_processq(sc, sc->sc_xrtxq);
 #endif
 
@ -243,7 +243,7 @@ Index: madwifi-dfs-r2996/ath/if_ath.c
 	netif_wake_queue(dev);
 
 	if (sc->sc_softled)
-@@ -8310,6 +8391,7 @@
+@@ -8332,6 +8413,7 @@
 ath_draintxq(struct ath_softc *sc)
 {
 	struct ath_hal *ah = sc->sc_ah;
@ -251,7 +251,7 @@ Index: madwifi-dfs-r2996/ath/if_ath.c
 	unsigned int i;
 
 	/* XXX return value */
-@@ -10077,9 +10159,9 @@
+@@ -10095,9 +10177,9 @@
 	dev->mtu = mtu;
 	if ((dev->flags & IFF_RUNNING) && !sc->sc_invalid) {
 		/* NB: the rx buffers may need to be reallocated */
@ -263,10 +263,10 @@ Index: madwifi-dfs-r2996/ath/if_ath.c
 	}
 	ATH_UNLOCK(sc);
 
-Index: madwifi-dfs-r2996/ath/if_athvar.h
+Index: madwifi-dfs-r3053/ath/if_athvar.h
 ===================================================================
--- madwifi-dfs-r2996.orig/ath/if_athvar.h	2007-12-01 18:53:03.188270880 +0100
-+++ madwifi-dfs-r2996/ath/if_athvar.h	2007-12-01 18:53:44.626632316 +0100
+--- madwifi-dfs-r3053.orig/ath/if_athvar.h	2007-12-13 05:25:12.842357313 +0100
+++ madwifi-dfs-r3053/ath/if_athvar.h	2007-12-13 05:25:13.666404270 +0100
@@ -50,6 +50,10 @@
 #include <asm/io.h>
 #include <linux/list.h>
@ -278,7 +278,7 @@ Index: madwifi-dfs-r2996/ath/if_athvar.h
 /*
  * Deduce if tasklets are available.  If not then
  * fall back to using the immediate work queue.
-@@ -727,7 +731,6 @@
+@@ -728,7 +732,6 @@
 	struct ath_buf *sc_rxbufcur;		/* current rx buffer */
 	u_int32_t *sc_rxlink;			/* link ptr in last RX desc */
 	spinlock_t sc_rxbuflock;
@ -286,7 +286,7 @@ Index: madwifi-dfs-r2996/ath/if_athvar.h
 	struct ATH_TQ_STRUCT sc_rxorntq;	/* rxorn intr tasklet */
 	u_int8_t sc_defant;			/* current default antenna */
 	u_int8_t sc_rxotherant;			/* RXs on non-default antenna */
-@@ -740,6 +743,7 @@
+@@ -741,6 +744,7 @@
 	u_int sc_txintrperiod;			/* tx interrupt batching */
 	struct ath_txq sc_txq[HAL_NUM_TX_QUEUES];
 	struct ath_txq *sc_ac2q[WME_NUM_AC];	/* WME AC -> h/w qnum */
@ -294,7 +294,7 @@ Index: madwifi-dfs-r2996/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 */
-@@ -852,6 +856,8 @@
+@@ -853,6 +857,8 @@
 #define	ATH_TXBUF_LOCK_CHECK(_sc)
 #endif
 
@ -303,10 +303,10 @@ Index: madwifi-dfs-r2996/ath/if_athvar.h
 
 #define	ATH_RXBUF_LOCK_INIT(_sc)	spin_lock_init(&(_sc)->sc_rxbuflock)
 #define	ATH_RXBUF_LOCK_DESTROY(_sc)
-Index: madwifi-dfs-r2996/net80211/ieee80211_input.c
+Index: madwifi-dfs-r3053/net80211/ieee80211_input.c
 ===================================================================
--- madwifi-dfs-r2996.orig/net80211/ieee80211_input.c	2007-12-01 18:47:16.968540943 +0100
-+++ madwifi-dfs-r2996/net80211/ieee80211_input.c	2007-12-01 18:53:44.638633004 +0100
+--- madwifi-dfs-r3053.orig/net80211/ieee80211_input.c	2007-12-13 05:25:10.374216660 +0100
+++ madwifi-dfs-r3053/net80211/ieee80211_input.c	2007-12-13 05:25:13.674404726 +0100
@@ -1178,7 +1178,7 @@
 			/* attach vlan tag */
 			struct ieee80211_node *ni_tmp = SKB_CB(skb)->ni;
@ -338,11 +338,11 @@ Index: madwifi-dfs-r2996/net80211/ieee80211_input.c
 			 * device was too busy */
 			if (ni_tmp != NULL) {
 				/* node reference was leaked */
-Index: madwifi-dfs-r2996/net80211/ieee80211_monitor.c
+Index: madwifi-dfs-r3053/net80211/ieee80211_monitor.c
 ===================================================================
--- madwifi-dfs-r2996.orig/net80211/ieee80211_monitor.c	2007-12-01 18:45:14.000000000 +0100
-+++ madwifi-dfs-r2996/net80211/ieee80211_monitor.c	2007-12-01 18:53:44.642633230 +0100
-@@ -571,7 +571,7 @@
+--- madwifi-dfs-r3053.orig/net80211/ieee80211_monitor.c	2007-12-13 05:25:10.386217344 +0100
+++ madwifi-dfs-r3053/net80211/ieee80211_monitor.c	2007-12-13 05:25:13.678404955 +0100
+@@ -577,7 +577,7 @@
 			skb1->protocol = __constant_htons(0x0019); /* ETH_P_80211_RAW */
 
 			ni_tmp = SKB_CB(skb1)->ni;
--- a/package/madwifi/patches/305-pureg_fix.patch
+++ b/package/madwifi/patches/305-pureg_fix.patch
@ -1,8 +1,8 @@
-Index: madwifi-dfs-r2996/ath/if_ath.c
+Index: madwifi-dfs-r3053/ath/if_ath.c
 ===================================================================
--- madwifi-dfs-r2996.orig/ath/if_ath.c	2007-12-01 18:54:22.276777879 +0100
-+++ madwifi-dfs-r2996/ath/if_ath.c	2007-12-01 18:54:45.982128761 +0100
-@@ -3998,7 +3998,9 @@
+--- madwifi-dfs-r3053.orig/ath/if_ath.c	2007-12-13 05:25:13.662404044 +0100
+++ madwifi-dfs-r3053/ath/if_ath.c	2007-12-13 05:25:13.934419543 +0100
+@@ -3973,7 +3973,9 @@
 		rfilt |= HAL_RX_FILTER_PROM;
 	if (ic->ic_opmode == IEEE80211_M_STA ||
 	    sc->sc_opmode == HAL_M_IBSS ||	/* NB: AHDEMO too */
@ -11,12 +11,12 @@ Index: madwifi-dfs-r2996/ath/if_ath.c
 +		((ic->ic_opmode == IEEE80211_M_HOSTAP) &&
 +		 (ic->ic_protmode != IEEE80211_PROT_NONE)))
 		rfilt |= HAL_RX_FILTER_BEACON;
- 	if ((sc->sc_nmonvaps > 0) || ((sc->sc_nvaps > 0) && (sc->sc_nibssvaps > 0)))
+ 	if (sc->sc_nmonvaps > 0)
 		rfilt |= (HAL_RX_FILTER_CONTROL | HAL_RX_FILTER_BEACON |
-Index: madwifi-dfs-r2996/net80211/ieee80211_input.c
+Index: madwifi-dfs-r3053/net80211/ieee80211_input.c
 ===================================================================
--- madwifi-dfs-r2996.orig/net80211/ieee80211_input.c	2007-12-01 18:53:44.638633004 +0100
-+++ madwifi-dfs-r2996/net80211/ieee80211_input.c	2007-12-01 18:54:45.986128992 +0100
+--- madwifi-dfs-r3053.orig/net80211/ieee80211_input.c	2007-12-13 05:25:13.674404726 +0100
+++ madwifi-dfs-r3053/net80211/ieee80211_input.c	2007-12-13 05:25:13.938419772 +0100
@@ -329,11 +329,12 @@
 				bssid = wh->i_addr3;
 			}
@ -97,10 +97,10 @@ Index: madwifi-dfs-r2996/net80211/ieee80211_input.c
 		/*
 		 * If scanning, just pass information to the scan module.
 		 */
-Index: madwifi-dfs-r2996/net80211/ieee80211_node.c
+Index: madwifi-dfs-r3053/net80211/ieee80211_node.c
 ===================================================================
--- madwifi-dfs-r2996.orig/net80211/ieee80211_node.c	2007-12-01 18:47:16.968540943 +0100
-+++ madwifi-dfs-r2996/net80211/ieee80211_node.c	2007-12-01 18:54:45.998129686 +0100
+--- madwifi-dfs-r3053.orig/net80211/ieee80211_node.c	2007-12-13 05:25:10.314213240 +0100
+++ madwifi-dfs-r3053/net80211/ieee80211_node.c	2007-12-13 05:25:13.938419772 +0100
@@ -380,10 +380,16 @@
 	/* Update country ie information */
 	ieee80211_build_countryie(ic);
@ -120,11 +120,11 @@ Index: madwifi-dfs-r2996/net80211/ieee80211_node.c
 
 	(void) ieee80211_sta_join1(PASS_NODE(ni));
 }
-Index: madwifi-dfs-r2996/net80211/ieee80211_proto.c
+Index: madwifi-dfs-r3053/net80211/ieee80211_proto.c
 ===================================================================
--- madwifi-dfs-r2996.orig/net80211/ieee80211_proto.c	2007-12-01 18:45:14.000000000 +0100
-+++ madwifi-dfs-r2996/net80211/ieee80211_proto.c	2007-12-01 18:54:46.002129908 +0100
-@@ -586,6 +586,28 @@
+--- madwifi-dfs-r3053.orig/net80211/ieee80211_proto.c	2007-12-13 05:25:10.322213696 +0100
+++ madwifi-dfs-r3053/net80211/ieee80211_proto.c	2007-12-13 05:25:13.942420001 +0100
+@@ -584,6 +584,28 @@
 	{ 4, { 2, 4, 11, 22 } },	/* IEEE80211_MODE_TURBO_G (mixed b/g) */
 };
 
@ -153,10 +153,10 @@ Index: madwifi-dfs-r2996/net80211/ieee80211_proto.c
 /*
  * Mark the basic rates for the 11g rate table based on the
  * specified mode.  For 11b compatibility we mark only 11b
-Index: madwifi-dfs-r2996/net80211/ieee80211_var.h
+Index: madwifi-dfs-r3053/net80211/ieee80211_var.h
 ===================================================================
--- madwifi-dfs-r2996.orig/net80211/ieee80211_var.h	2007-12-01 18:45:14.000000000 +0100
-+++ madwifi-dfs-r2996/net80211/ieee80211_var.h	2007-12-01 18:55:00.502956262 +0100
+--- madwifi-dfs-r3053.orig/net80211/ieee80211_var.h	2007-12-13 05:25:10.330214154 +0100
+++ madwifi-dfs-r3053/net80211/ieee80211_var.h	2007-12-13 05:25:13.942420001 +0100
@@ -668,6 +668,7 @@
 void ieee80211_build_sc_ie(struct ieee80211com *);
 void ieee80211_dfs_action(struct ieee80211com *);
--- a/package/madwifi/patches/309-micfail_detect.patch
+++ b/package/madwifi/patches/309-micfail_detect.patch
@ -1,8 +1,8 @@
-Index: madwifi-ng-r2978-20071127/ath/if_ath.c
+Index: madwifi-dfs-r3053/ath/if_ath.c
 ===================================================================
--- madwifi-ng-r2978-20071127.orig/ath/if_ath.c	2007-11-27 21:50:53.125694356 +0100
-+++ madwifi-ng-r2978-20071127/ath/if_ath.c	2007-11-27 21:59:09.565984878 +0100
-@@ -6085,6 +6085,7 @@
+--- madwifi-dfs-r3053.orig/ath/if_ath.c	2007-12-13 05:25:13.934419543 +0100
+++ madwifi-dfs-r3053/ath/if_ath.c	2007-12-13 05:25:14.210435274 +0100
+@@ -6322,6 +6322,7 @@
 	u_int phyerr;
 	u_int processed = 0, early_stop = 0;
 	u_int rx_limit = dev->quota;
@ -10,7 +10,7 @@ Index: madwifi-ng-r2978-20071127/ath/if_ath.c
 
 	DPRINTF(sc, ATH_DEBUG_RX_PROC, "%s\n", __func__);
 process_rx_again:
-@@ -6181,24 +6182,8 @@
+@@ -6418,24 +6419,8 @@
 			}
 			if (rs->rs_status & HAL_RXERR_MIC) {
 				sc->sc_stats.ast_rx_badmic++;
@ -37,7 +37,7 @@ Index: madwifi-ng-r2978-20071127/ath/if_ath.c
 			}
 			/*
 			 * Reject error frames if we have no vaps that
-@@ -6257,8 +6242,9 @@
+@@ -6494,8 +6479,9 @@
 		/*
 		 * Finished monitor mode handling, now reject
 		 * error frames before passing to other vaps
@ -48,7 +48,7 @@ Index: madwifi-ng-r2978-20071127/ath/if_ath.c
 			ieee80211_dev_kfree_skb(&skb);
 			goto rx_next;
 		}
-@@ -6266,6 +6252,26 @@
+@@ -6503,6 +6489,26 @@
 		/* remove the CRC */
 		skb_trim(skb, skb->len - IEEE80211_CRC_LEN);
 
@ -75,7 +75,7 @@ Index: madwifi-ng-r2978-20071127/ath/if_ath.c
 		/*
 		 * From this point on we assume the frame is at least
 		 * as large as ieee80211_frame_min; verify that.
-@@ -6287,6 +6293,7 @@
+@@ -6524,6 +6530,7 @@
 				   sc->sc_hwmap[rs->rs_rate].ieeerate,
 				   rs->rs_rssi);
 
@ -83,10 +83,10 @@ Index: madwifi-ng-r2978-20071127/ath/if_ath.c
 		/*
 		 * Locate the node for sender, track state, and then
 		 * pass the (referenced) node up to the 802.11 layer
-Index: madwifi-ng-r2978-20071127/net80211/ieee80211_crypto_ccmp.c
+Index: madwifi-dfs-r3053/net80211/ieee80211_crypto_ccmp.c
 ===================================================================
--- madwifi-ng-r2978-20071127.orig/net80211/ieee80211_crypto_ccmp.c	2007-11-27 21:43:39.604989422 +0100
-+++ madwifi-ng-r2978-20071127/net80211/ieee80211_crypto_ccmp.c	2007-11-27 21:58:39.516272443 +0100
+--- madwifi-dfs-r3053.orig/net80211/ieee80211_crypto_ccmp.c	2007-12-13 05:25:12.634345457 +0100
+++ madwifi-dfs-r3053/net80211/ieee80211_crypto_ccmp.c	2007-12-13 05:25:14.210435274 +0100
@@ -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);
@ -105,10 +105,10 @@ Index: madwifi-ng-r2978-20071127/net80211/ieee80211_crypto_ccmp.c
 {
 	return 1;
 }
-Index: madwifi-ng-r2978-20071127/net80211/ieee80211_crypto.h
+Index: madwifi-dfs-r3053/net80211/ieee80211_crypto.h
 ===================================================================
--- madwifi-ng-r2978-20071127.orig/net80211/ieee80211_crypto.h	2007-10-29 23:33:03.000000000 +0100
-+++ madwifi-ng-r2978-20071127/net80211/ieee80211_crypto.h	2007-11-27 21:58:39.524272897 +0100
+--- madwifi-dfs-r3053.orig/net80211/ieee80211_crypto.h	2007-12-13 05:25:10.214207541 +0100
+++ madwifi-dfs-r3053/net80211/ieee80211_crypto.h	2007-12-13 05:25:14.210435274 +0100
@@ -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);
@ -131,10 +131,10 @@ Index: madwifi-ng-r2978-20071127/net80211/ieee80211_crypto.h
 }
 
 /*
-Index: madwifi-ng-r2978-20071127/net80211/ieee80211_crypto_none.c
+Index: madwifi-dfs-r3053/net80211/ieee80211_crypto_none.c
 ===================================================================
--- madwifi-ng-r2978-20071127.orig/net80211/ieee80211_crypto_none.c	2006-09-20 10:45:13.000000000 +0200
-+++ madwifi-ng-r2978-20071127/net80211/ieee80211_crypto_none.c	2007-11-27 21:58:39.528273126 +0100
+--- madwifi-dfs-r3053.orig/net80211/ieee80211_crypto_none.c	2007-12-13 05:25:10.218207770 +0100
+++ madwifi-dfs-r3053/net80211/ieee80211_crypto_none.c	2007-12-13 05:25:14.214435503 +0100
@@ -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);
@ -153,10 +153,10 @@ Index: madwifi-ng-r2978-20071127/net80211/ieee80211_crypto_none.c
 {
 	struct ieee80211vap *vap = k->wk_private;
 
-Index: madwifi-ng-r2978-20071127/net80211/ieee80211_crypto_tkip.c
+Index: madwifi-dfs-r3053/net80211/ieee80211_crypto_tkip.c
 ===================================================================
--- madwifi-ng-r2978-20071127.orig/net80211/ieee80211_crypto_tkip.c	2007-10-28 21:40:04.000000000 +0100
-+++ madwifi-ng-r2978-20071127/net80211/ieee80211_crypto_tkip.c	2007-11-27 21:58:39.532273356 +0100
+--- madwifi-dfs-r3053.orig/net80211/ieee80211_crypto_tkip.c	2007-12-13 05:25:10.226208226 +0100
+++ madwifi-dfs-r3053/net80211/ieee80211_crypto_tkip.c	2007-12-13 05:25:14.214435503 +0100
@@ -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);
@ -184,10 +184,10 @@ Index: madwifi-ng-r2978-20071127/net80211/ieee80211_crypto_tkip.c
 		struct ieee80211vap *vap = ctx->tc_vap;
 		u8 mic[IEEE80211_WEP_MICLEN];
 		u8 mic0[IEEE80211_WEP_MICLEN];
-Index: madwifi-ng-r2978-20071127/net80211/ieee80211_crypto_wep.c
+Index: madwifi-dfs-r3053/net80211/ieee80211_crypto_wep.c
 ===================================================================
--- madwifi-ng-r2978-20071127.orig/net80211/ieee80211_crypto_wep.c	2007-05-29 23:55:25.000000000 +0200
-+++ madwifi-ng-r2978-20071127/net80211/ieee80211_crypto_wep.c	2007-11-27 21:58:39.536273583 +0100
+--- madwifi-dfs-r3053.orig/net80211/ieee80211_crypto_wep.c	2007-12-13 05:25:10.234208681 +0100
+++ madwifi-dfs-r3053/net80211/ieee80211_crypto_wep.c	2007-12-13 05:25:14.214435503 +0100
@@ -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);
@ -206,11 +206,11 @@ Index: madwifi-ng-r2978-20071127/net80211/ieee80211_crypto_wep.c
 {
 	return 1;
 }
-Index: madwifi-ng-r2978-20071127/net80211/ieee80211_input.c
+Index: madwifi-dfs-r3053/net80211/ieee80211_input.c
 ===================================================================
--- madwifi-ng-r2978-20071127.orig/net80211/ieee80211_input.c	2007-11-27 21:50:53.133694814 +0100
-+++ madwifi-ng-r2978-20071127/net80211/ieee80211_input.c	2007-11-27 21:58:39.536273583 +0100
-@@ -640,7 +640,7 @@
+--- madwifi-dfs-r3053.orig/net80211/ieee80211_input.c	2007-12-13 05:25:13.938419772 +0100
+++ madwifi-dfs-r3053/net80211/ieee80211_input.c	2007-12-13 05:25:14.218435729 +0100
+@@ -646,7 +646,7 @@
 		 * Next strip any MSDU crypto bits.
 		 */
 		if (key != NULL &&
@ -219,7 +219,7 @@ Index: madwifi-ng-r2978-20071127/net80211/ieee80211_input.c
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
 				ni->ni_macaddr, "data", "%s", "demic error");
 			IEEE80211_NODE_STAT(ni, rx_demicfail);
-@@ -3812,6 +3812,47 @@
+@@ -4168,6 +4168,47 @@
 }
 #endif
 
@ -267,10 +267,10 @@ Index: madwifi-ng-r2978-20071127/net80211/ieee80211_input.c
 #ifdef IEEE80211_DEBUG
 /*
  * Debugging support.
-Index: madwifi-ng-r2978-20071127/net80211/ieee80211_proto.h
+Index: madwifi-dfs-r3053/net80211/ieee80211_proto.h
 ===================================================================
--- madwifi-ng-r2978-20071127.orig/net80211/ieee80211_proto.h	2007-06-18 19:14:03.000000000 +0200
-+++ madwifi-ng-r2978-20071127/net80211/ieee80211_proto.h	2007-11-27 21:58:39.540273808 +0100
+--- madwifi-dfs-r3053.orig/net80211/ieee80211_proto.h	2007-12-13 05:25:10.246209365 +0100
+++ madwifi-dfs-r3053/net80211/ieee80211_proto.h	2007-12-13 05:25:14.218435729 +0100
@@ -91,6 +91,7 @@
 void ieee80211_set11gbasicrates(struct ieee80211_rateset *, enum ieee80211_phymode);
 enum ieee80211_phymode ieee80211_get11gbasicrates(struct ieee80211_rateset *);
@ -279,10 +279,10 @@ Index: madwifi-ng-r2978-20071127/net80211/ieee80211_proto.h
 
 /*
  * Return the size of the 802.11 header for a management or data frame.
-Index: madwifi-ng-r2978-20071127/net80211/ieee80211_linux.c
+Index: madwifi-dfs-r3053/net80211/ieee80211_linux.c
 ===================================================================
--- madwifi-ng-r2978-20071127.orig/net80211/ieee80211_linux.c	2007-11-27 21:43:39.592988736 +0100
-+++ madwifi-ng-r2978-20071127/net80211/ieee80211_linux.c	2007-11-27 21:58:39.540273808 +0100
+--- madwifi-dfs-r3053.orig/net80211/ieee80211_linux.c	2007-12-13 05:25:12.422333377 +0100
+++ madwifi-dfs-r3053/net80211/ieee80211_linux.c	2007-12-13 05:25:14.218435729 +0100
@@ -337,8 +337,8 @@
 	/* TODO: needed parameters: count, keyid, key type, src address, TSC */
 	snprintf(buf, sizeof(buf), "%s(keyid=%d %scast addr=%s)", tag,
@ -294,11 +294,11 @@ Index: madwifi-ng-r2978-20071127/net80211/ieee80211_linux.c
 	memset(&wrqu, 0, sizeof(wrqu));
 	wrqu.data.length = strlen(buf);
 	wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf);
-Index: madwifi-ng-r2978-20071127/net80211/ieee80211_output.c
+Index: madwifi-dfs-r3053/net80211/ieee80211_output.c
 ===================================================================
--- madwifi-ng-r2978-20071127.orig/net80211/ieee80211_output.c	2007-11-22 03:08:35.000000000 +0100
-+++ madwifi-ng-r2978-20071127/net80211/ieee80211_output.c	2007-11-27 21:58:39.540273808 +0100
-@@ -1093,13 +1093,16 @@
+--- madwifi-dfs-r3053.orig/net80211/ieee80211_output.c	2007-12-13 05:25:10.262210276 +0100
+++ madwifi-dfs-r3053/net80211/ieee80211_output.c	2007-12-13 05:25:14.222435959 +0100
+@@ -1092,13 +1092,16 @@
 			cip = (struct ieee80211_cipher *) key->wk_cipher;
 			ciphdrsize = cip->ic_header;
 			tailsize += (cip->ic_trailer + cip->ic_miclen);
@ -318,11 +318,11 @@ Index: madwifi-ng-r2978-20071127/net80211/ieee80211_output.c
 
 		/*
 		 * Allocate sk_buff for each subsequent fragment; First fragment
-Index: madwifi-ng-r2978-20071127/net80211/ieee80211_node.c
+Index: madwifi-dfs-r3053/net80211/ieee80211_node.c
 ===================================================================
--- madwifi-ng-r2978-20071127.orig/net80211/ieee80211_node.c	2007-11-27 21:50:53.141695270 +0100
-+++ madwifi-ng-r2978-20071127/net80211/ieee80211_node.c	2007-11-27 21:59:52.592436814 +0100
-@@ -2165,11 +2165,13 @@
+--- madwifi-dfs-r3053.orig/net80211/ieee80211_node.c	2007-12-13 05:25:13.938419772 +0100
+++ madwifi-dfs-r3053/net80211/ieee80211_node.c	2007-12-13 05:25:14.222435959 +0100
+@@ -2236,11 +2236,13 @@
 	/* From this point onwards we can no longer find the node,
 	 * so no more references are generated
 	 */
--- a/package/madwifi/patches/310-noise_get.patch
+++ b/package/madwifi/patches/310-noise_get.patch
@ -1,16 +1,16 @@
-Index: madwifi-ng-r2978-20071127/ath/if_ath.c
+Index: madwifi-dfs-r3053/ath/if_ath.c
 ===================================================================
--- madwifi-ng-r2978-20071127.orig/ath/if_ath.c	2007-11-27 21:59:09.565984878 +0100
-+++ madwifi-ng-r2978-20071127/ath/if_ath.c	2007-11-27 22:01:09.964846018 +0100
-@@ -1597,7 +1597,6 @@
- 	 * Wireshark and Kismet.
- 	 */
+--- madwifi-dfs-r3053.orig/ath/if_ath.c	2007-12-13 05:25:14.210435274 +0100
+++ madwifi-dfs-r3053/ath/if_ath.c	2007-12-13 05:25:14.558455106 +0100
+@@ -1648,7 +1648,6 @@
+ 	/* XXXAPSD: build in check against max triggers we could see
+ 	 *          based on ic->ic_uapsdmaxtriggers. */
 	hw_tsf = ath_hal_gettsf64(ah);
 -	ic->ic_channoise = ath_hal_get_channel_noise(ah, &(sc->sc_curchan));
 
 	ATH_RXBUF_LOCK_IRQ(sc);
 	if (sc->sc_rxbufcur == NULL)
-@@ -8536,6 +8535,7 @@
+@@ -8815,6 +8814,7 @@
 		if (ath_calinterval == ATH_LONG_CALINTERVAL)
 			ath_calinterval = ATH_SHORT_CALINTERVAL;
 	}
@ -18,7 +18,7 @@ Index: madwifi-ng-r2978-20071127/ath/if_ath.c
 
 	DPRINTF(sc, ATH_DEBUG_CALIBRATE, "%s: channel %u/%x -- IQ %s.\n",
 		__func__, sc->sc_curchan.channel, sc->sc_curchan.channelFlags,
-@@ -8590,6 +8590,7 @@
+@@ -8869,6 +8869,7 @@
 	struct ath_softc *sc = dev->priv;
 
 	(void) ath_chan_set(sc, ic->ic_curchan);
@ -26,11 +26,11 @@ Index: madwifi-ng-r2978-20071127/ath/if_ath.c
 	/*
 	 * If we are returning to our bss channel then mark state
 	 * so the next recv'd beacon's TSF will be used to sync the
-@@ -8812,6 +8813,7 @@
+@@ -9095,6 +9096,7 @@
 		}
 
 		ath_hal_process_noisefloor(ah);
 +		ic->ic_channoise = ath_hal_get_channel_noise(ah, &(sc->sc_curchan));
 		/*
- 		 * Configure the beacon and sleep timers.
+ 		 * Reset rssi stats; maybe not the best place...
 		 */