From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 18 Jul 2008 22:50:46 +0000 (+0000)
Subject: refresh madwifi-testing patches
X-Git-Tag: reboot~26085
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=16731f482f4d3f3e94c90beb70c9cbba9c8dd631;p=oweals%2Fopenwrt.git

refresh madwifi-testing patches

SVN-Revision: 11866
---

diff --git a/package/madwifi/patches-r3776/104-autocreate_none.patch b/package/madwifi/patches-r3776/104-autocreate_none.patch
index 5796787eb1..16ce6e8639 100644
--- a/package/madwifi/patches-r3776/104-autocreate_none.patch
+++ b/package/madwifi/patches-r3776/104-autocreate_none.patch
@@ -1,7 +1,5 @@
-Index: madwifi-trunk-r3776/ath/if_ath.c
-===================================================================
---- madwifi-trunk-r3776.orig/ath/if_ath.c	2008-07-17 00:36:00.000000000 +0200
-+++ madwifi-trunk-r3776/ath/if_ath.c	2008-07-17 00:47:22.000000000 +0200
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
 @@ -482,7 +482,7 @@
  	HAL_STATUS status;
  	int error = 0;
diff --git a/package/madwifi/patches-r3776/105-ratectl_attach.patch b/package/madwifi/patches-r3776/105-ratectl_attach.patch
index 3748599611..79b08dfb82 100644
--- a/package/madwifi/patches-r3776/105-ratectl_attach.patch
+++ b/package/madwifi/patches-r3776/105-ratectl_attach.patch
@@ -1,7 +1,5 @@
-Index: madwifi-trunk-r3776/net80211/ieee80211_rate.c
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_rate.c	2008-07-17 00:35:59.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_rate.c	2008-07-17 00:47:27.000000000 +0200
+--- a/net80211/ieee80211_rate.c
++++ b/net80211/ieee80211_rate.c
 @@ -100,8 +100,18 @@
  		ieee80211_load_module(buf);
  
diff --git a/package/madwifi/patches-r3776/111-minstrel_crash.patch b/package/madwifi/patches-r3776/111-minstrel_crash.patch
index 250a21ff25..dd96c4e60f 100644
--- a/package/madwifi/patches-r3776/111-minstrel_crash.patch
+++ b/package/madwifi/patches-r3776/111-minstrel_crash.patch
@@ -1,7 +1,5 @@
-Index: madwifi-trunk-r3776/ath_rate/minstrel/minstrel.c
-===================================================================
---- madwifi-trunk-r3776.orig/ath_rate/minstrel/minstrel.c	2008-07-17 00:35:59.000000000 +0200
-+++ madwifi-trunk-r3776/ath_rate/minstrel/minstrel.c	2008-07-17 00:47:36.000000000 +0200
+--- a/ath_rate/minstrel/minstrel.c
++++ b/ath_rate/minstrel/minstrel.c
 @@ -415,6 +415,9 @@
  			return;
  		}
diff --git a/package/madwifi/patches-r3776/122-replayfail_workaround.patch b/package/madwifi/patches-r3776/122-replayfail_workaround.patch
index c016e723b3..de5a8f3160 100644
--- a/package/madwifi/patches-r3776/122-replayfail_workaround.patch
+++ b/package/madwifi/patches-r3776/122-replayfail_workaround.patch
@@ -1,7 +1,5 @@
-Index: madwifi-trunk-r3776/net80211/ieee80211_linux.c
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_linux.c	2008-07-17 00:21:29.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_linux.c	2008-07-17 00:49:54.000000000 +0200
+--- a/net80211/ieee80211_linux.c
++++ b/net80211/ieee80211_linux.c
 @@ -330,6 +330,9 @@
  		k->wk_cipher->ic_name, k->wk_keyix,
  		(unsigned long long)rsc);
diff --git a/package/madwifi/patches-r3776/123-ccmp_checks.patch b/package/madwifi/patches-r3776/123-ccmp_checks.patch
index a0dba1ca60..6db9c2d781 100644
--- a/package/madwifi/patches-r3776/123-ccmp_checks.patch
+++ b/package/madwifi/patches-r3776/123-ccmp_checks.patch
@@ -1,7 +1,5 @@
-Index: madwifi-trunk-r3776/net80211/ieee80211_crypto_ccmp.c
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_crypto_ccmp.c	2008-07-17 00:21:29.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_crypto_ccmp.c	2008-07-17 00:49:59.000000000 +0200
+--- a/net80211/ieee80211_crypto_ccmp.c
++++ b/net80211/ieee80211_crypto_ccmp.c
 @@ -478,6 +478,9 @@
  	uint8_t *mic, *pos;
  	u_int space;
diff --git a/package/madwifi/patches-r3776/124-linux24_compat.patch b/package/madwifi/patches-r3776/124-linux24_compat.patch
index 0ef7d92741..2ab9364b96 100644
--- a/package/madwifi/patches-r3776/124-linux24_compat.patch
+++ b/package/madwifi/patches-r3776/124-linux24_compat.patch
@@ -1,7 +1,5 @@
-Index: madwifi-trunk-r3776/ath/if_athvar.h
-===================================================================
---- madwifi-trunk-r3776.orig/ath/if_athvar.h	2008-07-17 00:21:39.000000000 +0200
-+++ madwifi-trunk-r3776/ath/if_athvar.h	2008-07-17 00:50:03.000000000 +0200
+--- a/ath/if_athvar.h
++++ b/ath/if_athvar.h
 @@ -129,6 +129,11 @@
  #define ATH_GET_NETDEV_DEV(ndev)	((ndev)->class_dev.dev)
  #endif
@@ -14,10 +12,8 @@ Index: madwifi-trunk-r3776/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-trunk-r3776/ath/if_ath_radar.c
-===================================================================
---- madwifi-trunk-r3776.orig/ath/if_ath_radar.c	2008-07-17 00:21:39.000000000 +0200
-+++ madwifi-trunk-r3776/ath/if_ath_radar.c	2008-07-17 00:50:03.000000000 +0200
+--- a/ath/if_ath_radar.c
++++ b/ath/if_ath_radar.c
 @@ -89,6 +89,13 @@
  #define nofloat_pct(_value, _pct) \
  	( (_value * (1000 + _pct)) / 1000 )
@@ -32,10 +28,8 @@ Index: madwifi-trunk-r3776/ath/if_ath_radar.c
  struct radar_pattern_specification {
  	/* The name of the rule/specification (i.e. what did we detect) */
  	const char *name;
-Index: madwifi-trunk-r3776/ath/if_ath.c
-===================================================================
---- madwifi-trunk-r3776.orig/ath/if_ath.c	2008-07-17 00:47:22.000000000 +0200
-+++ madwifi-trunk-r3776/ath/if_ath.c	2008-07-17 00:50:03.000000000 +0200
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
 @@ -4878,6 +4878,46 @@
  	return (txqs & (1 << qnum));
  }
@@ -83,10 +77,8 @@ Index: madwifi-trunk-r3776/ath/if_ath.c
  /*
   * Generate beacon frame and queue cab data for a VAP.
   */
-Index: madwifi-trunk-r3776/net80211/sort.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ madwifi-trunk-r3776/net80211/sort.c	2008-07-17 00:50:03.000000000 +0200
+--- /dev/null
++++ b/net80211/sort.c
 @@ -0,0 +1,120 @@
 +/*
 + * A fast, small, non-recursive O(nlog n) sort for the Linux kernel
diff --git a/package/madwifi/patches-r3776/126-rxerr_frames.patch b/package/madwifi/patches-r3776/126-rxerr_frames.patch
index 4639b5abfb..f95124135a 100644
--- a/package/madwifi/patches-r3776/126-rxerr_frames.patch
+++ b/package/madwifi/patches-r3776/126-rxerr_frames.patch
@@ -1,7 +1,5 @@
-Index: madwifi-trunk-r3776/ath/if_ath.c
-===================================================================
---- madwifi-trunk-r3776.orig/ath/if_ath.c	2008-07-17 00:52:28.000000000 +0200
-+++ madwifi-trunk-r3776/ath/if_ath.c	2008-07-17 00:53:04.000000000 +0200
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
 @@ -6451,9 +6451,6 @@
  		rs = &bf->bf_dsstatus.ds_rxstat;
  
diff --git a/package/madwifi/patches-r3776/200-no_debug.patch b/package/madwifi/patches-r3776/200-no_debug.patch
index b28782cfe6..0797f8fb65 100644
--- a/package/madwifi/patches-r3776/200-no_debug.patch
+++ b/package/madwifi/patches-r3776/200-no_debug.patch
@@ -1,7 +1,5 @@
-Index: madwifi-trunk-r3776/ath/if_ath.c
-===================================================================
---- madwifi-trunk-r3776.orig/ath/if_ath.c	2008-07-17 00:53:04.000000000 +0200
-+++ madwifi-trunk-r3776/ath/if_ath.c	2008-07-17 01:15:21.000000000 +0200
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
 @@ -323,8 +323,10 @@
  static void ath_set_dfs_cac_time(struct ieee80211com *, unsigned int seconds);
  
@@ -148,10 +146,8 @@ Index: madwifi-trunk-r3776/ath/if_ath.c
  /* If we are shutting down or blowing off the DFS channel availability check
   * then we call this to stop the behavior before we take the rest of the
   * necessary actions (such as a DFS reaction to radar). */
-Index: madwifi-trunk-r3776/ath_rate/amrr/amrr.c
-===================================================================
---- madwifi-trunk-r3776.orig/ath_rate/amrr/amrr.c	2008-07-17 00:21:30.000000000 +0200
-+++ madwifi-trunk-r3776/ath_rate/amrr/amrr.c	2008-07-17 00:53:20.000000000 +0200
+--- a/ath_rate/amrr/amrr.c
++++ b/ath_rate/amrr/amrr.c
 @@ -70,7 +70,9 @@
  
  #include "amrr.h"
@@ -162,10 +158,8 @@ Index: madwifi-trunk-r3776/ath_rate/amrr/amrr.c
  #ifdef AMRR_DEBUG
  #define	DPRINTF(sc, _fmt, ...) do {					\
  	if (sc->sc_debug & 0x10)					\
-Index: madwifi-trunk-r3776/ath_rate/minstrel/minstrel.c
-===================================================================
---- madwifi-trunk-r3776.orig/ath_rate/minstrel/minstrel.c	2008-07-17 00:47:36.000000000 +0200
-+++ madwifi-trunk-r3776/ath_rate/minstrel/minstrel.c	2008-07-17 01:16:06.000000000 +0200
+--- a/ath_rate/minstrel/minstrel.c
++++ b/ath_rate/minstrel/minstrel.c
 @@ -117,7 +117,9 @@
  
  #include "minstrel.h"
@@ -187,10 +181,8 @@ Index: madwifi-trunk-r3776/ath_rate/minstrel/minstrel.c
  
  	IEEE80211_NODE_TABLE_LOCK_IRQ(nt);
  	TAILQ_FOREACH(ni, &nt->nt_node, ni_list) {
-Index: madwifi-trunk-r3776/ath_rate/onoe/onoe.c
-===================================================================
---- madwifi-trunk-r3776.orig/ath_rate/onoe/onoe.c	2008-07-17 00:21:29.000000000 +0200
-+++ madwifi-trunk-r3776/ath_rate/onoe/onoe.c	2008-07-17 00:53:20.000000000 +0200
+--- a/ath_rate/onoe/onoe.c
++++ b/ath_rate/onoe/onoe.c
 @@ -66,7 +66,9 @@
  
  #include "onoe.h"
@@ -201,10 +193,8 @@ Index: madwifi-trunk-r3776/ath_rate/onoe/onoe.c
  #ifdef ONOE_DEBUG
  enum {
  	ATH_DEBUG_RATE	= 0x00000010,	/* rate control */
-Index: madwifi-trunk-r3776/ath_rate/sample/sample.c
-===================================================================
---- madwifi-trunk-r3776.orig/ath_rate/sample/sample.c	2008-07-17 00:21:30.000000000 +0200
-+++ madwifi-trunk-r3776/ath_rate/sample/sample.c	2008-07-17 00:53:20.000000000 +0200
+--- a/ath_rate/sample/sample.c
++++ b/ath_rate/sample/sample.c
 @@ -68,7 +68,9 @@
  
  #include "sample.h"
@@ -216,10 +206,8 @@ Index: madwifi-trunk-r3776/ath_rate/sample/sample.c
  #ifdef SAMPLE_DEBUG
  enum {
  	ATH_DEBUG_RATE		= 0x00000010,	/* rate control */
-Index: madwifi-trunk-r3776/tools/do_multi.c
-===================================================================
---- madwifi-trunk-r3776.orig/tools/do_multi.c	2008-07-17 00:46:52.000000000 +0200
-+++ madwifi-trunk-r3776/tools/do_multi.c	2008-07-17 00:53:20.000000000 +0200
+--- a/tools/do_multi.c
++++ b/tools/do_multi.c
 @@ -9,16 +9,20 @@
  
      progname = basename(argv[0]);
@@ -241,10 +229,8 @@ Index: madwifi-trunk-r3776/tools/do_multi.c
      if(strcmp(progname, "athkey") == 0)
  	ret =  athkey_init(argc, argv);
      if(strcmp(progname, "athstats") == 0)
-Index: madwifi-trunk-r3776/tools/Makefile
-===================================================================
---- madwifi-trunk-r3776.orig/tools/Makefile	2008-07-17 00:45:15.000000000 +0200
-+++ madwifi-trunk-r3776/tools/Makefile	2008-07-17 01:10:33.000000000 +0200
+--- a/tools/Makefile
++++ b/tools/Makefile
 @@ -39,6 +39,10 @@
  
  ATH_HAL = $(TOP)/ath_hal
@@ -284,10 +270,8 @@ Index: madwifi-trunk-r3776/tools/Makefile
  
  all: all-subdirs compile
  
-Index: madwifi-trunk-r3776/ath/if_ath_hal.h
-===================================================================
---- madwifi-trunk-r3776.orig/ath/if_ath_hal.h	2008-07-17 00:21:39.000000000 +0200
-+++ madwifi-trunk-r3776/ath/if_ath_hal.h	2008-07-17 00:53:20.000000000 +0200
+--- a/ath/if_ath_hal.h
++++ b/ath/if_ath_hal.h
 @@ -1263,6 +1263,7 @@
  
             tail -f /var/log/messages | sed -f hal_unmangle.sed 
@@ -305,10 +289,8 @@ Index: madwifi-trunk-r3776/ath/if_ath_hal.h
  #include "if_ath_hal_wrappers.h"
  #include "if_ath_hal_extensions.h"
  
-Index: madwifi-trunk-r3776/net80211/ieee80211_var.h
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_var.h	2008-07-17 00:21:29.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_var.h	2008-07-17 00:53:20.000000000 +0200
+--- a/net80211/ieee80211_var.h
++++ b/net80211/ieee80211_var.h
 @@ -495,9 +495,10 @@
  	/* inject a fake radar signal -- used while on a 802.11h DFS channels */
  	unsigned int (*ic_test_radar)(struct ieee80211com *);
@@ -321,10 +303,8 @@ Index: madwifi-trunk-r3776/net80211/ieee80211_var.h
  	/* DFS channel availability check time (in seconds) */
  	void (*ic_set_dfs_cac_time)(struct ieee80211com *, unsigned int);
  	unsigned int (*ic_get_dfs_cac_time)(struct ieee80211com *);
-Index: madwifi-trunk-r3776/net80211/ieee80211_wireless.c
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_wireless.c	2008-07-17 00:21:29.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_wireless.c	2008-07-17 00:53:20.000000000 +0200
+--- a/net80211/ieee80211_wireless.c
++++ b/net80211/ieee80211_wireless.c
 @@ -1557,6 +1557,7 @@
  	return 0;
  }
@@ -363,10 +343,8 @@ Index: madwifi-trunk-r3776/net80211/ieee80211_wireless.c
  	set_priv(IEEE80211_IOCTL_ADDMAC, ieee80211_ioctl_addmac),
  	set_priv(IEEE80211_IOCTL_DELMAC, ieee80211_ioctl_delmac),
  	set_priv(IEEE80211_IOCTL_WDSADDMAC, ieee80211_ioctl_wdsmac),
-Index: madwifi-trunk-r3776/ath/if_ath_debug.h
-===================================================================
---- madwifi-trunk-r3776.orig/ath/if_ath_debug.h	2008-07-17 00:21:39.000000000 +0200
-+++ madwifi-trunk-r3776/ath/if_ath_debug.h	2008-07-17 00:53:20.000000000 +0200
+--- a/ath/if_ath_debug.h
++++ b/ath/if_ath_debug.h
 @@ -54,6 +54,10 @@
  	ATH_DEBUG_GLOBAL	= (ATH_DEBUG_SKB|ATH_DEBUG_SKB_REF)
  };
@@ -414,10 +392,8 @@ Index: madwifi-trunk-r3776/ath/if_ath_debug.h
 +#endif
  
  #endif /* #ifndef _IF_ATH_DEBUG_H_ */
-Index: madwifi-trunk-r3776/ath/if_ath_pci.c
-===================================================================
---- madwifi-trunk-r3776.orig/ath/if_ath_pci.c	2008-07-17 00:21:39.000000000 +0200
-+++ madwifi-trunk-r3776/ath/if_ath_pci.c	2008-07-17 00:53:20.000000000 +0200
+--- a/ath/if_ath_pci.c
++++ b/ath/if_ath_pci.c
 @@ -134,8 +134,10 @@
  	u16 vdevice;
  	int i;
diff --git a/package/madwifi/patches-r3776/201-no_debug_extra.patch b/package/madwifi/patches-r3776/201-no_debug_extra.patch
index f1fe4aff52..0e26d5f398 100644
--- a/package/madwifi/patches-r3776/201-no_debug_extra.patch
+++ b/package/madwifi/patches-r3776/201-no_debug_extra.patch
@@ -1,7 +1,5 @@
-Index: madwifi-trunk-r3776/ath/if_ath.c
-===================================================================
---- madwifi-trunk-r3776.orig/ath/if_ath.c	2008-07-17 01:15:21.000000000 +0200
-+++ madwifi-trunk-r3776/ath/if_ath.c	2008-07-17 01:20:11.000000000 +0200
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
 @@ -423,8 +423,8 @@
  		"defaults to '" DEF_RATE_CTL "'");
  MODULE_PARM_DESC(intmit, "Enable interference mitigation by default.  Default is 0.");
@@ -33,4 +31,3 @@ Index: madwifi-trunk-r3776/ath/if_ath.c
  
  	ic->ic_wme.wme_update = ath_wme_update;
  	ic->ic_uapsd_flush = ath_uapsd_flush;
-
diff --git a/package/madwifi/patches-r3776/300-napi_polling.patch b/package/madwifi/patches-r3776/300-napi_polling.patch
index cf32b34c2d..27dd838db0 100644
--- a/package/madwifi/patches-r3776/300-napi_polling.patch
+++ b/package/madwifi/patches-r3776/300-napi_polling.patch
@@ -1,7 +1,5 @@
-Index: madwifi-trunk-r3776/ath/if_ath.c
-===================================================================
---- madwifi-trunk-r3776.orig/ath/if_ath.c	2008-07-18 23:26:43.000000000 +0200
-+++ madwifi-trunk-r3776/ath/if_ath.c	2008-07-18 23:29:26.000000000 +0200
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
 @@ -182,7 +182,11 @@
  	struct sk_buff *, int, int, u_int64_t);
  static void ath_setdefantenna(struct ath_softc *, u_int);
@@ -388,10 +386,8 @@ Index: madwifi-trunk-r3776/ath/if_ath.c
  	}
  	ATH_UNLOCK(sc);
  
-Index: madwifi-trunk-r3776/ath/if_athvar.h
-===================================================================
---- madwifi-trunk-r3776.orig/ath/if_athvar.h	2008-07-18 23:26:22.000000000 +0200
-+++ madwifi-trunk-r3776/ath/if_athvar.h	2008-07-18 23:27:47.000000000 +0200
+--- a/ath/if_athvar.h
++++ b/ath/if_athvar.h
 @@ -56,6 +56,10 @@
  # include	<asm/bitops.h>
  #endif
@@ -438,10 +434,8 @@ Index: madwifi-trunk-r3776/ath/if_athvar.h
  
  #define	ATH_RXBUF_LOCK_INIT(_sc)	spin_lock_init(&(_sc)->sc_rxbuflock)
  #define	ATH_RXBUF_LOCK_DESTROY(_sc)
-Index: madwifi-trunk-r3776/net80211/ieee80211_skb.c
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_skb.c	2008-07-18 23:26:22.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_skb.c	2008-07-18 23:27:47.000000000 +0200
+--- a/net80211/ieee80211_skb.c
++++ b/net80211/ieee80211_skb.c
 @@ -73,7 +73,7 @@
  #undef dev_queue_xmit
  #undef kfree_skb
@@ -471,10 +465,8 @@ Index: madwifi-trunk-r3776/net80211/ieee80211_skb.c
  EXPORT_SYMBOL(alloc_skb_debug);
  EXPORT_SYMBOL(dev_alloc_skb_debug);
  EXPORT_SYMBOL(skb_clone_debug);
-Index: madwifi-trunk-r3776/net80211/ieee80211_skb.h
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_skb.h	2008-07-18 23:26:22.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_skb.h	2008-07-18 23:27:47.000000000 +0200
+--- a/net80211/ieee80211_skb.h
++++ b/net80211/ieee80211_skb.h
 @@ -115,7 +115,7 @@
  
  int vlan_hwaccel_rx_debug(struct sk_buff *skb, struct vlan_group *grp,
@@ -504,10 +496,8 @@ Index: madwifi-trunk-r3776/net80211/ieee80211_skb.h
  #define	alloc_skb(_length, _gfp_mask) \
  	alloc_skb_debug(_length, _gfp_mask, __func__, __LINE__)
  #define	dev_alloc_skb(_length) \
-Index: madwifi-trunk-r3776/net80211/ieee80211_input.c
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_input.c	2008-07-18 23:26:22.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_input.c	2008-07-18 23:27:47.000000000 +0200
+--- a/net80211/ieee80211_input.c
++++ b/net80211/ieee80211_input.c
 @@ -1185,7 +1185,7 @@
  			ret = vlan_hwaccel_rx(skb,
  					vap->iv_vlgrp, ni->ni_vlan);
@@ -526,10 +516,8 @@ Index: madwifi-trunk-r3776/net80211/ieee80211_input.c
  			vap->iv_devstats.rx_dropped++;
  	}
  }
-Index: madwifi-trunk-r3776/net80211/ieee80211_monitor.c
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_monitor.c	2008-07-18 23:26:22.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_monitor.c	2008-07-18 23:27:47.000000000 +0200
+--- a/net80211/ieee80211_monitor.c
++++ b/net80211/ieee80211_monitor.c
 @@ -580,7 +580,7 @@
  
  			if (SKB_NI(skb1) != NULL)
diff --git a/package/madwifi/patches-r3776/301-pureg_fix.patch b/package/madwifi/patches-r3776/301-pureg_fix.patch
index de8d83c052..fb6cefe364 100644
--- a/package/madwifi/patches-r3776/301-pureg_fix.patch
+++ b/package/madwifi/patches-r3776/301-pureg_fix.patch
@@ -1,8 +1,6 @@
-Index: madwifi-trunk-r3776/ath/if_ath.c
-===================================================================
---- madwifi-trunk-r3776.orig/ath/if_ath.c	2008-07-17 01:46:37.000000000 +0200
-+++ madwifi-trunk-r3776/ath/if_ath.c	2008-07-17 01:46:44.000000000 +0200
-@@ -4250,7 +4250,9 @@
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
+@@ -4251,7 +4251,9 @@
  		rfilt |= HAL_RX_FILTER_PROM;
  	if (ic->ic_opmode == IEEE80211_M_STA ||
  	    sc->sc_opmode == HAL_M_IBSS ||	/* NB: AHDEMO too */
@@ -13,10 +11,8 @@ Index: madwifi-trunk-r3776/ath/if_ath.c
  		rfilt |= HAL_RX_FILTER_BEACON;
  	if (sc->sc_nmonvaps > 0)
  		rfilt |= (HAL_RX_FILTER_CONTROL | HAL_RX_FILTER_BEACON |
-Index: madwifi-trunk-r3776/net80211/ieee80211_input.c
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_input.c	2008-07-17 01:41:16.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_input.c	2008-07-17 01:46:44.000000000 +0200
+--- a/net80211/ieee80211_input.c
++++ b/net80211/ieee80211_input.c
 @@ -325,11 +325,12 @@
  				bssid = wh->i_addr3;
  			}
@@ -108,10 +104,8 @@ Index: madwifi-trunk-r3776/net80211/ieee80211_input.c
  		/*
  		 * If scanning, just pass information to the scan module.
  		 */
-Index: madwifi-trunk-r3776/net80211/ieee80211_node.c
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_node.c	2008-07-17 00:53:20.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_node.c	2008-07-17 01:46:44.000000000 +0200
+--- a/net80211/ieee80211_node.c
++++ b/net80211/ieee80211_node.c
 @@ -345,10 +345,16 @@
  	/* Update country ie information */
  	ieee80211_build_countryie(ic);
@@ -131,10 +125,8 @@ Index: madwifi-trunk-r3776/net80211/ieee80211_node.c
  
  	(void) ieee80211_sta_join1(PASS_NODE(ni));
  }
-Index: madwifi-trunk-r3776/net80211/ieee80211_proto.c
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_proto.c	2008-07-17 00:21:29.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_proto.c	2008-07-17 01:46:44.000000000 +0200
+--- a/net80211/ieee80211_proto.c
++++ b/net80211/ieee80211_proto.c
 @@ -599,6 +599,28 @@
  	{ 4, { 2, 4, 11, 22 } },	/* IEEE80211_MODE_TURBO_G (mixed b/g) */
  };
@@ -164,10 +156,8 @@ Index: madwifi-trunk-r3776/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-trunk-r3776/net80211/ieee80211_var.h
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_var.h	2008-07-17 00:53:20.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_var.h	2008-07-17 01:46:44.000000000 +0200
+--- a/net80211/ieee80211_var.h
++++ b/net80211/ieee80211_var.h
 @@ -712,6 +712,7 @@
  void ieee80211_build_sc_ie(struct ieee80211com *);
  void ieee80211_dfs_action(struct ieee80211com *);
diff --git a/package/madwifi/patches-r3776/302-noise_get.patch b/package/madwifi/patches-r3776/302-noise_get.patch
index 98440f76a0..8c69ca24f4 100644
--- a/package/madwifi/patches-r3776/302-noise_get.patch
+++ b/package/madwifi/patches-r3776/302-noise_get.patch
@@ -1,8 +1,6 @@
-Index: madwifi-trunk-r3776/ath/if_ath.c
-===================================================================
---- madwifi-trunk-r3776.orig/ath/if_ath.c	2008-07-17 01:46:44.000000000 +0200
-+++ madwifi-trunk-r3776/ath/if_ath.c	2008-07-17 01:49:58.000000000 +0200
-@@ -8996,6 +8996,7 @@
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
+@@ -8997,6 +8997,7 @@
  			ATH_LONG_CALINTERVAL_SECS : 
  			ATH_SHORT_CALINTERVAL_SECS;
  	}
@@ -10,7 +8,7 @@ Index: madwifi-trunk-r3776/ath/if_ath.c
  
  	DPRINTF(sc, ATH_DEBUG_CALIBRATE, "Channel %u [flags=%04x] -- IQ %s.\n",
  		sc->sc_curchan.channel, sc->sc_curchan.channelFlags,
-@@ -9051,6 +9052,7 @@
+@@ -9052,6 +9053,7 @@
  	struct ath_softc *sc = dev->priv;
  
  	(void) ath_chan_set(sc, ic->ic_curchan);
@@ -18,10 +16,8 @@ Index: madwifi-trunk-r3776/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
-Index: madwifi-trunk-r3776/net80211/ieee80211_wireless.c
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_wireless.c	2008-07-17 00:53:20.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_wireless.c	2008-07-17 01:49:58.000000000 +0200
+--- a/net80211/ieee80211_wireless.c
++++ b/net80211/ieee80211_wireless.c
 @@ -4396,6 +4396,7 @@
  	si->isi_state = ni->ni_flags;
  	si->isi_authmode = ni->ni_authmode;
@@ -30,10 +26,8 @@ Index: madwifi-trunk-r3776/net80211/ieee80211_wireless.c
  	si->isi_capinfo = ni->ni_capinfo;
  	si->isi_athflags = ni->ni_ath_flags;
  	si->isi_erp = ni->ni_erp;
-Index: madwifi-trunk-r3776/net80211/ieee80211_ioctl.h
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_ioctl.h	2008-07-17 00:21:29.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_ioctl.h	2008-07-17 01:49:58.000000000 +0200
+--- a/net80211/ieee80211_ioctl.h
++++ b/net80211/ieee80211_ioctl.h
 @@ -312,6 +312,7 @@
  	u_int16_t isi_state;		/* state flags */
  	u_int8_t isi_authmode;		/* authentication algorithm */
diff --git a/package/madwifi/patches-r3776/303-bssid_alloc.patch b/package/madwifi/patches-r3776/303-bssid_alloc.patch
index 49e507a7c9..43e0d6dcf5 100644
--- a/package/madwifi/patches-r3776/303-bssid_alloc.patch
+++ b/package/madwifi/patches-r3776/303-bssid_alloc.patch
@@ -1,7 +1,5 @@
-Index: madwifi-trunk-r3776/ath/if_ath.c
-===================================================================
---- madwifi-trunk-r3776.orig/ath/if_ath.c	2008-07-17 01:49:58.000000000 +0200
-+++ madwifi-trunk-r3776/ath/if_ath.c	2008-07-17 01:57:39.000000000 +0200
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
 @@ -1347,11 +1347,12 @@
  			TAILQ_FOREACH(v, &ic->ic_vaps, iv_next)
  				id_mask |= (1 << ATH_GET_VAP_ID(v->iv_myaddr));
@@ -29,10 +27,8 @@ Index: madwifi-trunk-r3776/ath/if_ath.c
  	avp->av_bslot = -1;
  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
  	atomic_set(&avp->av_beacon_alloc, 0);
-Index: madwifi-trunk-r3776/ath/if_athvar.h
-===================================================================
---- madwifi-trunk-r3776.orig/ath/if_athvar.h	2008-07-17 01:27:21.000000000 +0200
-+++ madwifi-trunk-r3776/ath/if_athvar.h	2008-07-17 01:57:15.000000000 +0200
+--- a/ath/if_athvar.h
++++ b/ath/if_athvar.h
 @@ -802,7 +802,7 @@
  	} sc_updateslot;			/* slot time update fsm */
  	int sc_slotupdate;			/* slot to next advance fsm */
diff --git a/package/madwifi/patches-r3776/304-erp_update.patch b/package/madwifi/patches-r3776/304-erp_update.patch
index 796406ecf7..be64b95371 100644
--- a/package/madwifi/patches-r3776/304-erp_update.patch
+++ b/package/madwifi/patches-r3776/304-erp_update.patch
@@ -1,7 +1,5 @@
-Index: madwifi-trunk-r3776/net80211/ieee80211_beacon.c
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_beacon.c	2008-07-17 00:21:29.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_beacon.c	2008-07-17 01:58:24.000000000 +0200
+--- a/net80211/ieee80211_beacon.c
++++ b/net80211/ieee80211_beacon.c
 @@ -544,10 +544,10 @@
  			vap->iv_flags &= ~IEEE80211_F_XRUPDATE;
  		}
@@ -15,10 +13,8 @@ Index: madwifi-trunk-r3776/net80211/ieee80211_beacon.c
  		}
  	}
  	/* if it is a mode change beacon for dynamic turbo case */
-Index: madwifi-trunk-r3776/net80211/ieee80211_input.c
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_input.c	2008-07-17 01:46:44.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_input.c	2008-07-17 01:58:24.000000000 +0200
+--- a/net80211/ieee80211_input.c
++++ b/net80211/ieee80211_input.c
 @@ -3384,9 +3384,12 @@
  			/* Assume no ERP IE == 11b AP */
  			if ((!has_erp || (has_erp && (scan.erp & IEEE80211_ERP_NON_ERP_PRESENT))) &&
@@ -33,10 +29,8 @@ Index: madwifi-trunk-r3776/net80211/ieee80211_input.c
  			}
  		}
  
-Index: madwifi-trunk-r3776/net80211/ieee80211_node.c
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_node.c	2008-07-17 01:46:44.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_node.c	2008-07-17 01:58:24.000000000 +0200
+--- a/net80211/ieee80211_node.c
++++ b/net80211/ieee80211_node.c
 @@ -1741,8 +1741,12 @@
  		}
  
diff --git a/package/madwifi/patches-r3776/305-bssid_mask.patch b/package/madwifi/patches-r3776/305-bssid_mask.patch
index 24d2f9f22c..bc02462a33 100644
--- a/package/madwifi/patches-r3776/305-bssid_mask.patch
+++ b/package/madwifi/patches-r3776/305-bssid_mask.patch
@@ -1,6 +1,6 @@
 --- a/ath/if_ath.c
 +++ b/ath/if_ath.c
-@@ -8692,6 +8692,10 @@
+@@ -8717,6 +8717,10 @@
  
  	sc->sc_rxbufcur = NULL;
  
diff --git a/package/madwifi/patches-r3776/306-queue.patch b/package/madwifi/patches-r3776/306-queue.patch
index 4b9665f99e..3341f01b88 100644
--- a/package/madwifi/patches-r3776/306-queue.patch
+++ b/package/madwifi/patches-r3776/306-queue.patch
@@ -1,8 +1,6 @@
-Index: madwifi-trunk-r3776/ath/if_ath.c
-===================================================================
---- madwifi-trunk-r3776.orig/ath/if_ath.c	2008-07-17 02:00:09.000000000 +0200
-+++ madwifi-trunk-r3776/ath/if_ath.c	2008-07-17 02:09:38.000000000 +0200
-@@ -8447,8 +8447,6 @@
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
+@@ -8448,8 +8448,6 @@
  	ath_hal_intrset(sc->sc_ah, sc->sc_imask);
  	local_irq_restore(flags);
  
@@ -11,7 +9,7 @@ Index: madwifi-trunk-r3776/ath/if_ath.c
  	if (sc->sc_softled)
  		ath_led_event(sc, ATH_LED_TX);
  }
-@@ -8504,8 +8502,6 @@
+@@ -8505,8 +8503,6 @@
  	ath_hal_intrset(sc->sc_ah, sc->sc_imask);
  	local_irq_restore(flags);
  
@@ -20,7 +18,7 @@ Index: madwifi-trunk-r3776/ath/if_ath.c
  	if (sc->sc_softled)
  		ath_led_event(sc, ATH_LED_TX);
  }
-@@ -8536,7 +8532,9 @@
+@@ -8537,7 +8533,9 @@
  				STAILQ_FIRST(&sc->sc_cabq->axq_q) ? "not setup" : "empty");
  		}
  	}
@@ -31,10 +29,8 @@ Index: madwifi-trunk-r3776/ath/if_ath.c
  
  	if (sc->sc_softled)
  		ath_led_event(sc, ATH_LED_TX);
-Index: madwifi-trunk-r3776/net80211/ieee80211_input.c
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_input.c	2008-07-17 02:04:20.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_input.c	2008-07-17 02:05:45.000000000 +0200
+--- a/net80211/ieee80211_input.c
++++ b/net80211/ieee80211_input.c
 @@ -1116,7 +1116,7 @@
  	    (vap->iv_flags & IEEE80211_F_NOBRIDGE) == 0) {
  		struct sk_buff *skb1 = NULL;
diff --git a/package/madwifi/patches-r3776/307-maxrate.patch b/package/madwifi/patches-r3776/307-maxrate.patch
index fc3363dc17..a5a1db02fb 100644
--- a/package/madwifi/patches-r3776/307-maxrate.patch
+++ b/package/madwifi/patches-r3776/307-maxrate.patch
@@ -1,7 +1,5 @@
-Index: madwifi-trunk-r3776/ath/if_ath.c
-===================================================================
---- madwifi-trunk-r3776.orig/ath/if_ath.c	2008-07-17 02:20:52.000000000 +0200
-+++ madwifi-trunk-r3776/ath/if_ath.c	2008-07-17 02:20:53.000000000 +0200
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
 @@ -1299,6 +1299,7 @@
  	vap->iv_key_set = ath_key_set;
  	vap->iv_key_update_begin = ath_key_update_begin;
@@ -10,10 +8,8 @@ Index: madwifi-trunk-r3776/ath/if_ath.c
  	if (sc->sc_default_ieee80211_debug) {
  		/* User specified defaults for new VAPs were provided, so
  		 * use those (only). */
-Index: madwifi-trunk-r3776/ath_rate/sample/sample.c
-===================================================================
---- madwifi-trunk-r3776.orig/ath_rate/sample/sample.c	2008-07-17 02:20:26.000000000 +0200
-+++ madwifi-trunk-r3776/ath_rate/sample/sample.c	2008-07-17 02:20:53.000000000 +0200
+--- a/ath_rate/sample/sample.c
++++ b/ath_rate/sample/sample.c
 @@ -838,7 +838,12 @@
  	}
  	sn->static_rate_ndx = -1;
@@ -28,10 +24,8 @@ Index: madwifi-trunk-r3776/ath_rate/sample/sample.c
  	for (x = 0; x < ni->ni_rates.rs_nrates; x++) {
  		sn->rates[x].rate = ni->ni_rates.rs_rates[x] & IEEE80211_RATE_VAL;
  		sn->rates[x].rix = sc->sc_rixmap[sn->rates[x].rate];
-Index: madwifi-trunk-r3776/net80211/ieee80211_var.h
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_var.h	2008-07-17 02:20:51.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_var.h	2008-07-17 02:20:53.000000000 +0200
+--- a/net80211/ieee80211_var.h
++++ b/net80211/ieee80211_var.h
 @@ -291,6 +291,7 @@
  	struct ieee80211_spy iv_spy;         		/* IWSPY support */
  	struct ieee80211_app_ie app_ie[IEEE80211_APPIE_NUM_OF_FRAME]; /* app-specified IEs by frame type */
@@ -40,10 +34,8 @@ Index: madwifi-trunk-r3776/net80211/ieee80211_var.h
  };
  
  /* Debug functions need the defintion of struct ieee80211vap because iv_debug 
-Index: madwifi-trunk-r3776/net80211/ieee80211_wireless.c
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_wireless.c	2008-07-17 02:20:51.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_wireless.c	2008-07-17 02:20:53.000000000 +0200
+--- a/net80211/ieee80211_wireless.c
++++ b/net80211/ieee80211_wireless.c
 @@ -2873,6 +2873,12 @@
  		else
  			ic->ic_flags_ext &= ~IEEE80211_FEXT_MARKDFS;
@@ -78,10 +70,8 @@ Index: madwifi-trunk-r3776/net80211/ieee80211_wireless.c
  	
  #ifdef ATH_REVERSE_ENGINEERING
  	/*
-Index: madwifi-trunk-r3776/net80211/ieee80211_ioctl.h
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_ioctl.h	2008-07-17 02:20:51.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_ioctl.h	2008-07-17 02:20:53.000000000 +0200
+--- a/net80211/ieee80211_ioctl.h
++++ b/net80211/ieee80211_ioctl.h
 @@ -650,6 +650,7 @@
  	IEEE80211_PARAM_RESETTXBUFS		= 80,   /* Reset transmit DMA */
  	IEEE80211_PARAM_SCANBUFS		= 81,	/* Heap analysis for TX DMA */
@@ -90,10 +80,8 @@ Index: madwifi-trunk-r3776/net80211/ieee80211_ioctl.h
  };
  
  #define	SIOCG80211STATS			(SIOCDEVPRIVATE+2)
-Index: madwifi-trunk-r3776/ath_rate/minstrel/minstrel.c
-===================================================================
---- madwifi-trunk-r3776.orig/ath_rate/minstrel/minstrel.c	2008-07-17 02:22:27.000000000 +0200
-+++ madwifi-trunk-r3776/ath_rate/minstrel/minstrel.c	2008-07-17 02:22:33.000000000 +0200
+--- a/ath_rate/minstrel/minstrel.c
++++ b/ath_rate/minstrel/minstrel.c
 @@ -644,6 +644,11 @@
  		return;
  	}
diff --git a/package/madwifi/patches-r3776/308-minrate.patch b/package/madwifi/patches-r3776/308-minrate.patch
index 616aec90a5..8e7b6066a8 100644
--- a/package/madwifi/patches-r3776/308-minrate.patch
+++ b/package/madwifi/patches-r3776/308-minrate.patch
@@ -1,7 +1,5 @@
-Index: madwifi-trunk-r3776/ath/if_ath.c
-===================================================================
---- madwifi-trunk-r3776.orig/ath/if_ath.c	2008-07-17 02:20:53.000000000 +0200
-+++ madwifi-trunk-r3776/ath/if_ath.c	2008-07-17 02:23:00.000000000 +0200
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
 @@ -1300,6 +1300,7 @@
  	vap->iv_key_update_begin = ath_key_update_begin;
  	vap->iv_key_update_end = ath_key_update_end;
@@ -10,10 +8,8 @@ Index: madwifi-trunk-r3776/ath/if_ath.c
  	if (sc->sc_default_ieee80211_debug) {
  		/* User specified defaults for new VAPs were provided, so
  		 * use those (only). */
-Index: madwifi-trunk-r3776/ath_rate/minstrel/minstrel.c
-===================================================================
---- madwifi-trunk-r3776.orig/ath_rate/minstrel/minstrel.c	2008-07-17 02:22:33.000000000 +0200
-+++ madwifi-trunk-r3776/ath_rate/minstrel/minstrel.c	2008-07-17 02:27:44.000000000 +0200
+--- a/ath_rate/minstrel/minstrel.c
++++ b/ath_rate/minstrel/minstrel.c
 @@ -652,6 +652,8 @@
  
  	sn->num_rates = ni->ni_rates.rs_nrates;
@@ -38,10 +34,8 @@ Index: madwifi-trunk-r3776/ath_rate/minstrel/minstrel.c
  		if (sn->rates[x].rix == 0xff) {
  			DPRINTF(sc, "%s: %s ignore bogus rix at %d\n",
  				dev_info, __func__, x);
-Index: madwifi-trunk-r3776/ath_rate/sample/sample.c
-===================================================================
---- madwifi-trunk-r3776.orig/ath_rate/sample/sample.c	2008-07-17 02:20:53.000000000 +0200
-+++ madwifi-trunk-r3776/ath_rate/sample/sample.c	2008-07-17 02:27:08.000000000 +0200
+--- a/ath_rate/sample/sample.c
++++ b/ath_rate/sample/sample.c
 @@ -845,8 +845,15 @@
  		sn->num_rates = vap->iv_maxrateindex;
  
@@ -60,10 +54,8 @@ Index: madwifi-trunk-r3776/ath_rate/sample/sample.c
  		if (sn->rates[x].rix == 0xff) {
  			DPRINTF(sc, ATH_DEBUG_RATE, "%s: %s ignore bogus rix at %u\n",
  				dev_info, __func__, x);
-Index: madwifi-trunk-r3776/net80211/ieee80211_ioctl.h
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_ioctl.h	2008-07-17 02:20:53.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_ioctl.h	2008-07-17 02:25:53.000000000 +0200
+--- a/net80211/ieee80211_ioctl.h
++++ b/net80211/ieee80211_ioctl.h
 @@ -651,6 +651,7 @@
  	IEEE80211_PARAM_SCANBUFS		= 81,	/* Heap analysis for TX DMA */
  	IEEE80211_PARAM_LEAKTXBUFS		= 82,	/* Leak tx buffers */
@@ -72,10 +64,8 @@ Index: madwifi-trunk-r3776/net80211/ieee80211_ioctl.h
  };
  
  #define	SIOCG80211STATS			(SIOCDEVPRIVATE+2)
-Index: madwifi-trunk-r3776/net80211/ieee80211_var.h
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_var.h	2008-07-17 02:20:53.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_var.h	2008-07-17 02:23:00.000000000 +0200
+--- a/net80211/ieee80211_var.h
++++ b/net80211/ieee80211_var.h
 @@ -292,6 +292,7 @@
  	struct ieee80211_app_ie app_ie[IEEE80211_APPIE_NUM_OF_FRAME]; /* app-specified IEs by frame type */
  	u_int32_t app_filter;				/* filters which management frames are forwarded to app */
@@ -84,10 +74,8 @@ Index: madwifi-trunk-r3776/net80211/ieee80211_var.h
  };
  
  /* Debug functions need the defintion of struct ieee80211vap because iv_debug 
-Index: madwifi-trunk-r3776/net80211/ieee80211_wireless.c
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_wireless.c	2008-07-17 02:20:53.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_wireless.c	2008-07-17 02:26:17.000000000 +0200
+--- a/net80211/ieee80211_wireless.c
++++ b/net80211/ieee80211_wireless.c
 @@ -2879,6 +2879,12 @@
  		else
  			vap->iv_maxrateindex = 0;
diff --git a/package/madwifi/patches-r3776/309-performance.patch b/package/madwifi/patches-r3776/309-performance.patch
index 517c336bea..ec22085258 100644
--- a/package/madwifi/patches-r3776/309-performance.patch
+++ b/package/madwifi/patches-r3776/309-performance.patch
@@ -1,7 +1,5 @@
-Index: madwifi-trunk-r3776/ath/if_ath.c
-===================================================================
---- madwifi-trunk-r3776.orig/ath/if_ath.c	2008-07-17 02:23:00.000000000 +0200
-+++ madwifi-trunk-r3776/ath/if_ath.c	2008-07-17 02:28:06.000000000 +0200
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
 @@ -3334,7 +3334,6 @@
  	struct ath_softc *sc = dev->priv;
  	struct ieee80211_node *ni = NULL;
@@ -18,10 +16,8 @@ Index: madwifi-trunk-r3776/ath/if_ath.c
  	unsigned int pktlen;
  	struct ieee80211com *ic = &sc->sc_ic;
  	struct ath_txq *txq = NULL;
-Index: madwifi-trunk-r3776/net80211/ieee80211_output.c
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_output.c	2008-07-17 00:21:29.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_output.c	2008-07-17 02:35:10.000000000 +0200
+--- a/net80211/ieee80211_output.c
++++ b/net80211/ieee80211_output.c
 @@ -280,7 +280,7 @@
  	 * normal vap. */
  	if (vap->iv_xrvap && (ni == vap->iv_bss) &&
@@ -188,10 +184,8 @@ Index: madwifi-trunk-r3776/net80211/ieee80211_output.c
  }
  
  #define	KEY_UNDEFINED(k)	((k).wk_cipher == &ieee80211_cipher_none)
-Index: madwifi-trunk-r3776/net80211/ieee80211_input.c
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_input.c	2008-07-17 02:20:52.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_input.c	2008-07-17 02:30:28.000000000 +0200
+--- a/net80211/ieee80211_input.c
++++ b/net80211/ieee80211_input.c
 @@ -713,7 +713,7 @@
  			/* ether_type must be length as FF frames are always LLC/SNAP encap'd */ 
  			frame_len = ntohs(eh_tmp->ether_type); 
diff --git a/package/madwifi/patches-r3776/310-minstrel_sampling.patch b/package/madwifi/patches-r3776/310-minstrel_sampling.patch
index a395b3cbef..b7f55d5005 100644
--- a/package/madwifi/patches-r3776/310-minstrel_sampling.patch
+++ b/package/madwifi/patches-r3776/310-minstrel_sampling.patch
@@ -1,8 +1,6 @@
-Index: madwifi-trunk-r3776/ath/if_ath.c
-===================================================================
---- madwifi-trunk-r3776.orig/ath/if_ath.c	2008-07-17 02:28:06.000000000 +0200
-+++ madwifi-trunk-r3776/ath/if_ath.c	2008-07-17 02:37:41.000000000 +0200
-@@ -8109,6 +8109,7 @@
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
+@@ -8110,6 +8110,7 @@
  		ath_hal_setupxtxdesc(sc->sc_ah, ds, mrr.rate1, mrr.retries1,
  				     mrr.rate2, mrr.retries2,
  				     mrr.rate3, mrr.retries3);
@@ -10,10 +8,8 @@ Index: madwifi-trunk-r3776/ath/if_ath.c
  	}
  
  #ifndef ATH_SUPERG_FF
-Index: madwifi-trunk-r3776/ath/if_athvar.h
-===================================================================
---- madwifi-trunk-r3776.orig/ath/if_athvar.h	2008-07-17 02:20:51.000000000 +0200
-+++ madwifi-trunk-r3776/ath/if_athvar.h	2008-07-17 02:37:41.000000000 +0200
+--- a/ath/if_athvar.h
++++ b/ath/if_athvar.h
 @@ -454,6 +454,7 @@
  	u_int16_t bf_flags;				/* tx descriptor flags */
  	u_int64_t bf_tsf;
@@ -22,10 +18,8 @@ Index: madwifi-trunk-r3776/ath/if_athvar.h
  #ifdef ATH_SUPERG_FF
  	/* XXX: combine this with bf_skbaddr if it ever changes to accommodate
  	 *      multiple segments.
-Index: madwifi-trunk-r3776/ath_rate/minstrel/minstrel.c
-===================================================================
---- madwifi-trunk-r3776.orig/ath_rate/minstrel/minstrel.c	2008-07-17 02:27:44.000000000 +0200
-+++ madwifi-trunk-r3776/ath_rate/minstrel/minstrel.c	2008-07-17 02:39:20.000000000 +0200
+--- a/ath_rate/minstrel/minstrel.c
++++ b/ath_rate/minstrel/minstrel.c
 @@ -341,18 +341,21 @@
  		if (sn->static_rate_ndx >= 0) {
  			    ndx = sn->static_rate_ndx;
@@ -78,10 +72,8 @@ Index: madwifi-trunk-r3776/ath_rate/minstrel/minstrel.c
  		if  (tries2 < 0)
  			return;
  		tries = tries - tries1;
-Index: madwifi-trunk-r3776/net80211/ieee80211_rate.h
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_rate.h	2008-07-17 00:21:29.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_rate.h	2008-07-17 02:37:41.000000000 +0200
+--- a/net80211/ieee80211_rate.h
++++ b/net80211/ieee80211_rate.h
 @@ -87,6 +87,7 @@
  	int retries2;
  	int rate3;
diff --git a/package/madwifi/patches-r3776/311-protmode_trigger.patch b/package/madwifi/patches-r3776/311-protmode_trigger.patch
index 29fc629089..2f462b9a6c 100644
--- a/package/madwifi/patches-r3776/311-protmode_trigger.patch
+++ b/package/madwifi/patches-r3776/311-protmode_trigger.patch
@@ -1,7 +1,5 @@
-Index: madwifi-trunk-r3776/net80211/ieee80211.c
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211.c	2008-07-17 00:21:29.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211.c	2008-07-17 02:56:18.000000000 +0200
+--- a/net80211/ieee80211.c
++++ b/net80211/ieee80211.c
 @@ -347,7 +347,9 @@
  			IEEE80211_MS_TO_TU(IEEE80211_BMISSTHRESH_DEFAULT_MS), 
  			ic->ic_lintval), ic->ic_lintval);
@@ -13,10 +11,8 @@ Index: madwifi-trunk-r3776/net80211/ieee80211.c
  	IEEE80211_LOCK_INIT(ic, "ieee80211com");
  	IEEE80211_VAPS_LOCK_INIT(ic, "ieee80211com_vaps");
  	TAILQ_INIT(&ic->ic_vaps);
-Index: madwifi-trunk-r3776/net80211/ieee80211_input.c
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_input.c	2008-07-17 02:30:28.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_input.c	2008-07-17 02:56:18.000000000 +0200
+--- a/net80211/ieee80211_input.c
++++ b/net80211/ieee80211_input.c
 @@ -3382,14 +3382,18 @@
  			IEEE80211_IS_CHAN_ANYG(ic->ic_curchan)) {
  
@@ -41,10 +37,8 @@ Index: madwifi-trunk-r3776/net80211/ieee80211_input.c
  			}
  		}
  
-Index: madwifi-trunk-r3776/net80211/ieee80211_ioctl.h
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_ioctl.h	2008-07-17 02:25:53.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_ioctl.h	2008-07-17 02:56:52.000000000 +0200
+--- a/net80211/ieee80211_ioctl.h
++++ b/net80211/ieee80211_ioctl.h
 @@ -652,6 +652,8 @@
  	IEEE80211_PARAM_LEAKTXBUFS		= 82,	/* Leak tx buffers */
  	IEEE80211_PARAM_MAXRATE			= 83,	/* Maximum rate (by table index) */
@@ -54,10 +48,8 @@ Index: madwifi-trunk-r3776/net80211/ieee80211_ioctl.h
  };
  
  #define	SIOCG80211STATS			(SIOCDEVPRIVATE+2)
-Index: madwifi-trunk-r3776/net80211/ieee80211_var.h
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_var.h	2008-07-17 02:23:00.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_var.h	2008-07-17 02:56:18.000000000 +0200
+--- a/net80211/ieee80211_var.h
++++ b/net80211/ieee80211_var.h
 @@ -138,6 +138,9 @@
  
  #define	IEEE80211_APPIE_MAX	1024
@@ -78,10 +70,8 @@ Index: madwifi-trunk-r3776/net80211/ieee80211_var.h
  
  	/* Channel state:
  	 *
-Index: madwifi-trunk-r3776/net80211/ieee80211_wireless.c
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_wireless.c	2008-07-17 02:26:17.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_wireless.c	2008-07-17 02:56:18.000000000 +0200
+--- a/net80211/ieee80211_wireless.c
++++ b/net80211/ieee80211_wireless.c
 @@ -2336,6 +2336,12 @@
  	case IEEE80211_PARAM_RSSI_EWMA:
  		ic->ic_rssi_ewma = value;
@@ -123,10 +113,8 @@ Index: madwifi-trunk-r3776/net80211/ieee80211_wireless.c
  	{ IEEE80211_PARAM_MCASTCIPHER,
  	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "mcastcipher" },
  	{ IEEE80211_PARAM_MCASTCIPHER,
-Index: madwifi-trunk-r3776/net80211/ieee80211_node.c
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_node.c	2008-07-17 02:20:51.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_node.c	2008-07-17 02:56:18.000000000 +0200
+--- a/net80211/ieee80211_node.c
++++ b/net80211/ieee80211_node.c
 @@ -1591,6 +1591,17 @@
  
  	ieee80211_scan_timeout(ic);
diff --git a/package/madwifi/patches-r3776/312-ack_cts_rate.patch b/package/madwifi/patches-r3776/312-ack_cts_rate.patch
index 3f172ca0b7..42bb4c1711 100644
--- a/package/madwifi/patches-r3776/312-ack_cts_rate.patch
+++ b/package/madwifi/patches-r3776/312-ack_cts_rate.patch
@@ -1,8 +1,6 @@
-Index: madwifi-trunk-r3776/ath/if_ath.c
-===================================================================
---- madwifi-trunk-r3776.orig/ath/if_ath.c	2008-07-17 02:37:41.000000000 +0200
-+++ madwifi-trunk-r3776/ath/if_ath.c	2008-07-17 03:04:02.000000000 +0200
-@@ -10889,8 +10889,13 @@
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
+@@ -10890,8 +10890,13 @@
  				break;
  #endif
  			case ATH_ACKRATE:
@@ -18,10 +16,8 @@ Index: madwifi-trunk-r3776/ath/if_ath.c
  				break;
  			case ATH_RP:
  				ath_rp_record(sc,
-Index: madwifi-trunk-r3776/ath/if_athvar.h
-===================================================================
---- madwifi-trunk-r3776.orig/ath/if_athvar.h	2008-07-17 02:37:41.000000000 +0200
-+++ madwifi-trunk-r3776/ath/if_athvar.h	2008-07-17 03:04:02.000000000 +0200
+--- a/ath/if_athvar.h
++++ b/ath/if_athvar.h
 @@ -698,6 +698,7 @@
  	unsigned int	sc_hasclrkey:1;		/* CLR key supported */
  	unsigned int	sc_stagbeacons:1;	/* use staggered beacons */
@@ -30,10 +26,8 @@ Index: madwifi-trunk-r3776/ath/if_athvar.h
  	unsigned int	sc_ackrate:1;		/* send acks at high bitrate */
  	unsigned int	sc_dfs_cac:1;		/* waiting on channel for radar detect */
  	unsigned int	sc_hasintmit:1;		/* Interference mitigation */
-Index: madwifi-trunk-r3776/ath/if_ath_hal_extensions.c
-===================================================================
---- madwifi-trunk-r3776.orig/ath/if_ath_hal_extensions.c	2008-07-17 00:21:39.000000000 +0200
-+++ madwifi-trunk-r3776/ath/if_ath_hal_extensions.c	2008-07-17 03:04:48.000000000 +0200
+--- a/ath/if_ath_hal_extensions.c
++++ b/ath/if_ath_hal_extensions.c
 @@ -129,6 +129,9 @@
  int
  ath_set_ack_bitrate(struct ath_softc *sc, int high)
diff --git a/package/madwifi/patches-r3776/313-reset_channelchange.patch b/package/madwifi/patches-r3776/313-reset_channelchange.patch
index 20a9c269d2..42d18ece07 100644
--- a/package/madwifi/patches-r3776/313-reset_channelchange.patch
+++ b/package/madwifi/patches-r3776/313-reset_channelchange.patch
@@ -1,8 +1,6 @@
-Index: madwifi-trunk-r3776/ath/if_ath.c
-===================================================================
---- madwifi-trunk-r3776.orig/ath/if_ath.c	2008-07-17 03:04:02.000000000 +0200
-+++ madwifi-trunk-r3776/ath/if_ath.c	2008-07-17 03:06:03.000000000 +0200
-@@ -8865,14 +8865,7 @@
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
+@@ -8866,14 +8866,7 @@
  			hchan.channel,
  			jiffies);
  
diff --git a/package/madwifi/patches-r3776/315-scanlist.patch b/package/madwifi/patches-r3776/315-scanlist.patch
index 470a9bc8b2..0ae0ed010a 100644
--- a/package/madwifi/patches-r3776/315-scanlist.patch
+++ b/package/madwifi/patches-r3776/315-scanlist.patch
@@ -1,7 +1,5 @@
-Index: madwifi-trunk-r3776/net80211/ieee80211_scan_sta.c
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_scan_sta.c	2008-07-17 00:21:29.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_scan_sta.c	2008-07-17 03:10:02.000000000 +0200
+--- a/net80211/ieee80211_scan_sta.c
++++ b/net80211/ieee80211_scan_sta.c
 @@ -318,147 +318,6 @@
  #undef ISPROBE
  }
@@ -341,10 +339,8 @@ Index: madwifi-trunk-r3776/net80211/ieee80211_scan_sta.c
  	.scan_restart		= sta_restart,
  	.scan_cancel		= sta_cancel,
  	.scan_end		= adhoc_pick_bss,
-Index: madwifi-trunk-r3776/net80211/ieee80211.c
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211.c	2008-07-17 02:56:18.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211.c	2008-07-17 03:07:53.000000000 +0200
+--- a/net80211/ieee80211.c
++++ b/net80211/ieee80211.c
 @@ -292,6 +292,11 @@
  			("channel with bogus ieee number %u", c->ic_ieee));
  		setbit(ic->ic_chan_avail, c->ic_ieee);
@@ -357,10 +353,8 @@ Index: madwifi-trunk-r3776/net80211/ieee80211.c
  		/* Identify mode capabilities. */
  		if (IEEE80211_IS_CHAN_A(c))
  			ic->ic_modecaps |= 1 << IEEE80211_MODE_11A;
-Index: madwifi-trunk-r3776/net80211/_ieee80211.h
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/_ieee80211.h	2008-07-17 00:21:29.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/_ieee80211.h	2008-07-17 03:07:53.000000000 +0200
+--- a/net80211/_ieee80211.h
++++ b/net80211/_ieee80211.h
 @@ -132,6 +132,11 @@
  	IEEE80211_SCAN_FIRST	= 2,	/* take first suitable candidate */
  };
@@ -381,10 +375,8 @@ Index: madwifi-trunk-r3776/net80211/_ieee80211.h
  };
  
  #define	IEEE80211_CHAN_MAX	255
-Index: madwifi-trunk-r3776/net80211/ieee80211_ioctl.h
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_ioctl.h	2008-07-17 02:56:52.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_ioctl.h	2008-07-17 03:07:53.000000000 +0200
+--- a/net80211/ieee80211_ioctl.h
++++ b/net80211/ieee80211_ioctl.h
 @@ -556,6 +556,7 @@
  #define	IEEE80211_IOCTL_WDSADDMAC	(SIOCIWFIRSTPRIV+26)
  #define	IEEE80211_IOCTL_WDSDELMAC	(SIOCIWFIRSTPRIV+28)
@@ -393,10 +385,8 @@ Index: madwifi-trunk-r3776/net80211/ieee80211_ioctl.h
  
  enum {
  	IEEE80211_WMMPARAMS_CWMIN       = 1,
-Index: madwifi-trunk-r3776/net80211/ieee80211_scan_ap.c
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_scan_ap.c	2008-07-17 02:20:50.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_scan_ap.c	2008-07-17 03:09:25.000000000 +0200
+--- a/net80211/ieee80211_scan_ap.c
++++ b/net80211/ieee80211_scan_ap.c
 @@ -200,131 +200,7 @@
  
  static int ap_flush(struct ieee80211_scan_state *);
@@ -651,7 +641,7 @@ Index: madwifi-trunk-r3776/net80211/ieee80211_scan_ap.c
  	ss->ss_next = 0;
  	/* XXX tunables */
  	ss->ss_mindwell = msecs_to_jiffies(200);	/* 200ms */
-@@ -834,13 +611,6 @@
+@@ -831,13 +608,6 @@
  		if (IEEE80211_IS_CHAN_RADAR(c->chan))
  			continue;
  
@@ -665,10 +655,8 @@ Index: madwifi-trunk-r3776/net80211/ieee80211_scan_ap.c
  		/* Verify mode matches any fixed mode specified */
  		if ((c->chan->ic_flags & as->as_required_mode) != 
  				as->as_required_mode)
-Index: madwifi-trunk-r3776/net80211/ieee80211_scan.c
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_scan.c	2008-07-17 00:49:51.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_scan.c	2008-07-17 03:07:53.000000000 +0200
+--- a/net80211/ieee80211_scan.c
++++ b/net80211/ieee80211_scan.c
 @@ -969,6 +969,80 @@
  	}
  }
@@ -750,10 +738,8 @@ Index: madwifi-trunk-r3776/net80211/ieee80211_scan.c
  /*
   * Execute radar channel change. This is called when a radar/dfs
   * signal is detected.  AP mode only.  Return 1 on success, 0 on
-Index: madwifi-trunk-r3776/net80211/ieee80211_scan.h
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_scan.h	2008-07-17 00:21:29.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_scan.h	2008-07-17 03:07:53.000000000 +0200
+--- a/net80211/ieee80211_scan.h
++++ b/net80211/ieee80211_scan.h
 @@ -219,4 +219,7 @@
  void ieee80211_scanner_unregister(enum ieee80211_opmode,
  	const struct ieee80211_scanner *);
@@ -762,10 +748,8 @@ Index: madwifi-trunk-r3776/net80211/ieee80211_scan.h
 +	struct ieee80211_scan_state *ss,
 +	enum ieee80211_phymode mode);
  #endif /* _NET80211_IEEE80211_SCAN_H_ */
-Index: madwifi-trunk-r3776/net80211/ieee80211_wireless.c
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_wireless.c	2008-07-17 02:56:18.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_wireless.c	2008-07-17 03:08:16.000000000 +0200
+--- a/net80211/ieee80211_wireless.c
++++ b/net80211/ieee80211_wireless.c
 @@ -3911,6 +3911,106 @@
  	return ieee80211_ioctl_setmlme(dev, info, w, (char *)&mlme);
  }
diff --git a/package/madwifi/patches-r3776/316-ani_fix.patch b/package/madwifi/patches-r3776/316-ani_fix.patch
index d14deac528..ad7deb036c 100644
--- a/package/madwifi/patches-r3776/316-ani_fix.patch
+++ b/package/madwifi/patches-r3776/316-ani_fix.patch
@@ -1,7 +1,5 @@
-Index: madwifi-trunk-r3776/ath/if_ath.c
-===================================================================
---- madwifi-trunk-r3776.orig/ath/if_ath.c	2008-07-17 03:06:03.000000000 +0200
-+++ madwifi-trunk-r3776/ath/if_ath.c	2008-07-17 03:53:09.000000000 +0200
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
 @@ -343,6 +343,8 @@
  		unsigned int param, unsigned int value);
  
@@ -203,7 +201,7 @@ Index: madwifi-trunk-r3776/ath/if_ath.c
  /*
   * Context: process context
   */
-@@ -4248,8 +4240,7 @@
+@@ -4249,8 +4241,7 @@
  	u_int32_t rfilt;
  
  	/* Preserve the current Phy. radar and err. filters. */
@@ -213,7 +211,7 @@ Index: madwifi-trunk-r3776/ath/if_ath.c
  		 HAL_RX_FILTER_UCAST | HAL_RX_FILTER_BCAST |
  		 HAL_RX_FILTER_MCAST;
  	if (ic->ic_opmode != IEEE80211_M_STA)
-@@ -4265,6 +4256,8 @@
+@@ -4266,6 +4257,8 @@
  	if (sc->sc_nmonvaps > 0)
  		rfilt |= (HAL_RX_FILTER_CONTROL | HAL_RX_FILTER_BEACON |
  			  HAL_RX_FILTER_PROBEREQ | HAL_RX_FILTER_PROM);
@@ -222,7 +220,7 @@ Index: madwifi-trunk-r3776/ath/if_ath.c
  	if (sc->sc_curchan.privFlags & CHANNEL_DFS)
  		rfilt |= (HAL_RX_FILTER_PHYERR | HAL_RX_FILTER_PHYRADAR);
  	return rfilt;
-@@ -6809,8 +6802,7 @@
+@@ -6810,8 +6803,7 @@
  	dev->quota -= bf_processed;
  #endif
  
@@ -232,7 +230,7 @@ Index: madwifi-trunk-r3776/ath/if_ath.c
  	if (!bf_processed)
  		DPRINTF(sc, ATH_DEBUG_RX_PROC,
  			"Warning: %s got scheduled when no receive "
-@@ -8726,7 +8718,6 @@
+@@ -8727,7 +8719,6 @@
  	ath_hal_rxena(ah);		/* enable recv descriptors */
  	ath_mode_init(dev);		/* set filters, etc. */
  	ath_hal_startpcurecv(ah);	/* re-enable PCU/DMA engine */
@@ -240,7 +238,7 @@ Index: madwifi-trunk-r3776/ath/if_ath.c
  	return 0;
  }
  
-@@ -10632,8 +10623,10 @@
+@@ -10633,8 +10624,10 @@
  	ATH_RP_IGNORED 		= 24,
  	ATH_RADAR_IGNORED       = 25,
  	ATH_MAXVAPS  		= 26,
@@ -253,7 +251,7 @@ Index: madwifi-trunk-r3776/ath/if_ath.c
  };
  
  static inline int 
-@@ -10695,6 +10688,48 @@
+@@ -10696,6 +10689,48 @@
  }
  
  static int
@@ -302,7 +300,7 @@ Index: madwifi-trunk-r3776/ath/if_ath.c
  ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl, write, filp, buffer, lenp, ppos)
  {
  	struct ath_softc *sc = ctl->extra1;
-@@ -10933,30 +10968,13 @@
+@@ -10934,30 +10969,13 @@
  				sc->sc_radar_ignored = val;
  				break;
  			case ATH_INTMIT:
@@ -339,7 +337,7 @@ Index: madwifi-trunk-r3776/ath/if_ath.c
  			default:
  				ret = -EINVAL;
  				break;
-@@ -11028,9 +11046,14 @@
+@@ -11029,9 +11047,14 @@
  		case ATH_RADAR_IGNORED:
  			val = sc->sc_radar_ignored;
  			break;
@@ -357,7 +355,7 @@ Index: madwifi-trunk-r3776/ath/if_ath.c
  		default:
  			ret = -EINVAL;
  			break;
-@@ -11412,6 +11435,24 @@
+@@ -11413,6 +11436,24 @@
  	  .maxlen	= sizeof(ath_xchanmode),
  	  .proc_handler	= proc_dointvec
  	},
@@ -382,10 +380,8 @@ Index: madwifi-trunk-r3776/ath/if_ath.c
  	{ 0 }
  };
  static ctl_table ath_ath_table[] = {
-Index: madwifi-trunk-r3776/ath/if_athvar.h
-===================================================================
---- madwifi-trunk-r3776.orig/ath/if_athvar.h	2008-07-17 03:04:02.000000000 +0200
-+++ madwifi-trunk-r3776/ath/if_athvar.h	2008-07-17 03:12:36.000000000 +0200
+--- a/ath/if_athvar.h
++++ b/ath/if_athvar.h
 @@ -712,6 +712,10 @@
  	unsigned int sc_txcont_power; /* Continuous transmit power in 0.5dBm units */
  	unsigned int sc_txcont_rate;  /* Continuous transmit rate in Mbps */
@@ -397,10 +393,8 @@ Index: madwifi-trunk-r3776/ath/if_athvar.h
  	/* rate tables */
  	const HAL_RATE_TABLE *sc_rates[IEEE80211_MODE_MAX];
  	const HAL_RATE_TABLE *sc_currates;	/* current rate table */
-Index: madwifi-trunk-r3776/ath/if_ath_hal_extensions.h
-===================================================================
---- madwifi-trunk-r3776.orig/ath/if_ath_hal_extensions.h	2008-07-17 00:21:39.000000000 +0200
-+++ madwifi-trunk-r3776/ath/if_ath_hal_extensions.h	2008-07-17 03:50:03.000000000 +0200
+--- a/ath/if_ath_hal_extensions.h
++++ b/ath/if_ath_hal_extensions.h
 @@ -237,296 +237,18 @@
  	AR5K_DMASIZE_512B
  };
@@ -701,10 +695,8 @@ Index: madwifi-trunk-r3776/ath/if_ath_hal_extensions.h
  
  static inline void ath_hal_set_dmasize_pcie(struct ath_hal *ah) {
  	SET_FIELD(ah, AR5K_TXCFG, AR5K_TXCFG_SDMAMR, AR5K_DMASIZE_128B);
-Index: madwifi-trunk-r3776/ath/if_ath_hal.h
-===================================================================
---- madwifi-trunk-r3776.orig/ath/if_ath_hal.h	2008-07-17 00:53:20.000000000 +0200
-+++ madwifi-trunk-r3776/ath/if_ath_hal.h	2008-07-17 03:41:25.000000000 +0200
+--- a/ath/if_ath_hal.h
++++ b/ath/if_ath_hal.h
 @@ -79,7 +79,7 @@
  	ath_hal_set_function(__func__);
  	ath_hal_set_device(SC_DEV_NAME(ah->ah_sc));
@@ -714,10 +706,8 @@ Index: madwifi-trunk-r3776/ath/if_ath_hal.h
  				resultsize);
  	ath_hal_set_function(NULL);
  	ath_hal_set_device(NULL);
-Index: madwifi-trunk-r3776/scripts/if_ath_hal_generator.pl
-===================================================================
---- madwifi-trunk-r3776.orig/scripts/if_ath_hal_generator.pl	2008-07-17 00:21:30.000000000 +0200
-+++ madwifi-trunk-r3776/scripts/if_ath_hal_generator.pl	2008-07-17 03:46:30.000000000 +0200
+--- a/scripts/if_ath_hal_generator.pl
++++ b/scripts/if_ath_hal_generator.pl
 @@ -145,7 +145,9 @@
      "ah_waitForBeaconDone"        => "ath_hal_waitforbeacon",
      "ah_writeAssocid"             => "ath_hal_setassocid",
diff --git a/package/madwifi/patches-r3776/317-devid.patch b/package/madwifi/patches-r3776/317-devid.patch
index d22d00545d..281e348f83 100644
--- a/package/madwifi/patches-r3776/317-devid.patch
+++ b/package/madwifi/patches-r3776/317-devid.patch
@@ -1,7 +1,5 @@
-Index: madwifi-trunk-r3776/ath/if_ath_pci.c
-===================================================================
---- madwifi-trunk-r3776.orig/ath/if_ath_pci.c	2008-07-17 00:53:20.000000000 +0200
-+++ madwifi-trunk-r3776/ath/if_ath_pci.c	2008-07-17 03:54:06.000000000 +0200
+--- a/ath/if_ath_pci.c
++++ b/ath/if_ath_pci.c
 @@ -114,11 +114,13 @@
  	{ 0x168c, 0x0023, PCI_ANY_ID, PCI_ANY_ID },
  	{ 0x168c, 0x0024, PCI_ANY_ID, PCI_ANY_ID },
diff --git a/package/madwifi/patches-r3776/318-ifxmips_eeprom.patch b/package/madwifi/patches-r3776/318-ifxmips_eeprom.patch
index 4fcc5926f6..412ceadeb6 100644
--- a/package/madwifi/patches-r3776/318-ifxmips_eeprom.patch
+++ b/package/madwifi/patches-r3776/318-ifxmips_eeprom.patch
@@ -1,7 +1,5 @@
-Index: madwifi-trunk-r3776/ath_hal/ah_os.c
-===================================================================
---- madwifi-trunk-r3776.orig/ath_hal/ah_os.c	2008-07-17 00:21:30.000000000 +0200
-+++ madwifi-trunk-r3776/ath_hal/ah_os.c	2008-07-17 04:00:18.000000000 +0200
+--- a/ath_hal/ah_os.c
++++ b/ath_hal/ah_os.c
 @@ -917,9 +917,56 @@
   * NB: see the comments in ah_osdep.h about byte-swapping register
   *     reads and writes to understand what's going on below.
diff --git a/package/madwifi/patches-r3776/319-eap_auth_disassoc.patch b/package/madwifi/patches-r3776/319-eap_auth_disassoc.patch
index 38f39d51ec..a1d9b0ba4e 100644
--- a/package/madwifi/patches-r3776/319-eap_auth_disassoc.patch
+++ b/package/madwifi/patches-r3776/319-eap_auth_disassoc.patch
@@ -3,11 +3,9 @@ critical packets failed.
 
 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
 
-Index: madwifi-trunk-r3776/ath/if_ath.c
-===================================================================
---- madwifi-trunk-r3776.orig/ath/if_ath.c	2008-07-17 03:53:09.000000000 +0200
-+++ madwifi-trunk-r3776/ath/if_ath.c	2008-07-17 04:00:42.000000000 +0200
-@@ -8272,6 +8272,18 @@
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
+@@ -8273,6 +8273,18 @@
  #endif
  				if (ts->ts_status & HAL_TXERR_XRETRY) {
  					sc->sc_stats.ast_tx_xretries++;
@@ -26,10 +24,8 @@ Index: madwifi-trunk-r3776/ath/if_ath.c
  					if (ni->ni_flags & IEEE80211_NODE_UAPSD_TRIG) {
  						ni->ni_stats.ns_tx_eosplost++;
  						DPRINTF(sc, ATH_DEBUG_UAPSD,
-Index: madwifi-trunk-r3776/net80211/ieee80211_linux.c
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_linux.c	2008-07-17 00:49:54.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_linux.c	2008-07-17 04:01:27.000000000 +0200
+--- a/net80211/ieee80211_linux.c
++++ b/net80211/ieee80211_linux.c
 @@ -158,6 +158,7 @@
  
  		SKB_NI(skb) = NULL;
@@ -38,10 +34,8 @@ Index: madwifi-trunk-r3776/net80211/ieee80211_linux.c
  
  		skb_reserve(skb, sizeof(struct ieee80211_frame));
  		*frm = skb_put(skb, pktlen);
-Index: madwifi-trunk-r3776/net80211/ieee80211_linux.h
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_linux.h	2008-07-17 00:53:20.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_linux.h	2008-07-17 04:02:15.000000000 +0200
+--- a/net80211/ieee80211_linux.h
++++ b/net80211/ieee80211_linux.h
 @@ -411,6 +411,7 @@
  #define M_SKB_TRACKED	0x20
  	void		(*next_destructor)(struct sk_buff *skb);
@@ -50,10 +44,8 @@ Index: madwifi-trunk-r3776/net80211/ieee80211_linux.h
  };
  
  struct __assert {
-Index: madwifi-trunk-r3776/net80211/ieee80211_output.c
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_output.c	2008-07-17 02:35:10.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_output.c	2008-07-17 04:00:42.000000000 +0200
+--- a/net80211/ieee80211_output.c
++++ b/net80211/ieee80211_output.c
 @@ -773,6 +773,8 @@
  	else
  		hdrsize = sizeof(struct ieee80211_frame);
diff --git a/package/madwifi/patches-r3776/320-hidden_ssid.patch b/package/madwifi/patches-r3776/320-hidden_ssid.patch
index d5a70832f5..92d0480d26 100644
--- a/package/madwifi/patches-r3776/320-hidden_ssid.patch
+++ b/package/madwifi/patches-r3776/320-hidden_ssid.patch
@@ -3,10 +3,8 @@ by some cisco systems.
 
 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
 
-Index: madwifi-trunk-r3776/net80211/ieee80211_scan_sta.c
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_scan_sta.c	2008-07-17 03:10:02.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_scan_sta.c	2008-07-17 04:02:41.000000000 +0200
+--- a/net80211/ieee80211_scan_sta.c
++++ b/net80211/ieee80211_scan_sta.c
 @@ -209,6 +209,19 @@
  		ieee80211_saveie(iep, ie);
  }
diff --git a/package/madwifi/patches-r3776/321-bgscan_rssi_thresh.patch b/package/madwifi/patches-r3776/321-bgscan_rssi_thresh.patch
index 5819193ed9..7020305ea8 100644
--- a/package/madwifi/patches-r3776/321-bgscan_rssi_thresh.patch
+++ b/package/madwifi/patches-r3776/321-bgscan_rssi_thresh.patch
@@ -4,10 +4,8 @@ time, before losing connectivity entirely)
 
 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
 
-Index: madwifi-trunk-r3776/net80211/ieee80211_ioctl.h
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_ioctl.h	2008-07-17 03:07:53.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_ioctl.h	2008-07-17 04:03:30.000000000 +0200
+--- a/net80211/ieee80211_ioctl.h
++++ b/net80211/ieee80211_ioctl.h
 @@ -655,6 +655,7 @@
  	IEEE80211_PARAM_MINRATE			= 84,	/* Minimum rate (by table index) */
  	IEEE80211_PARAM_PROTMODE_RSSI		= 85,	/* RSSI Threshold for enabling protection mode */
@@ -16,10 +14,8 @@ Index: madwifi-trunk-r3776/net80211/ieee80211_ioctl.h
  };
  
  #define	SIOCG80211STATS			(SIOCDEVPRIVATE+2)
-Index: madwifi-trunk-r3776/net80211/ieee80211_var.h
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_var.h	2008-07-17 02:56:18.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_var.h	2008-07-17 04:03:07.000000000 +0200
+--- a/net80211/ieee80211_var.h
++++ b/net80211/ieee80211_var.h
 @@ -92,6 +92,8 @@
  #define	IEEE80211_BGSCAN_IDLE_MIN	100	/* min idle time (ms) */
  #define	IEEE80211_BGSCAN_IDLE_DEFAULT	250	/* default idle time (ms) */
@@ -47,10 +43,8 @@ Index: madwifi-trunk-r3776/net80211/ieee80211_var.h
  
  #define IEEE80211_COM_UAPSD_ENABLE(_ic)		((_ic)->ic_flags_ext |= IEEE80211_FEXT_UAPSD)
  #define IEEE80211_COM_UAPSD_DISABLE(_ic)	((_ic)->ic_flags_ext &= ~IEEE80211_FEXT_UAPSD)
-Index: madwifi-trunk-r3776/net80211/ieee80211_wireless.c
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_wireless.c	2008-07-17 03:08:16.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_wireless.c	2008-07-17 04:03:07.000000000 +0200
+--- a/net80211/ieee80211_wireless.c
++++ b/net80211/ieee80211_wireless.c
 @@ -2778,6 +2778,9 @@
  		else
  			retv = EINVAL;
@@ -82,10 +76,8 @@ Index: madwifi-trunk-r3776/net80211/ieee80211_wireless.c
  	{ IEEE80211_PARAM_MCAST_RATE,
  	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "mcast_rate" },
  	{ IEEE80211_PARAM_MCAST_RATE,
-Index: madwifi-trunk-r3776/net80211/ieee80211_input.c
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_input.c	2008-07-17 02:56:18.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_input.c	2008-07-17 04:03:07.000000000 +0200
+--- a/net80211/ieee80211_input.c
++++ b/net80211/ieee80211_input.c
 @@ -2984,8 +2984,10 @@
  {
  	struct ieee80211com *ic = vap->iv_ic;
@@ -122,10 +114,8 @@ Index: madwifi-trunk-r3776/net80211/ieee80211_input.c
  			if (ni->ni_intval != scan.bintval) {
  				IEEE80211_NOTE(vap, IEEE80211_MSG_ASSOC, ni,
  						"beacon interval divergence: "
-Index: madwifi-trunk-r3776/net80211/ieee80211_scan.c
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_scan.c	2008-07-17 03:07:53.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_scan.c	2008-07-17 04:03:07.000000000 +0200
+--- a/net80211/ieee80211_scan.c
++++ b/net80211/ieee80211_scan.c
 @@ -793,7 +793,7 @@
  				ieee80211_sta_pwrsave(vap, 0);
  				if (ss->ss_next >= ss->ss_last) {
diff --git a/package/madwifi/patches-r3776/322-ignore_broken_bssid.patch b/package/madwifi/patches-r3776/322-ignore_broken_bssid.patch
index f185dbfd25..0bae461f6b 100644
--- a/package/madwifi/patches-r3776/322-ignore_broken_bssid.patch
+++ b/package/madwifi/patches-r3776/322-ignore_broken_bssid.patch
@@ -3,10 +3,8 @@ Ignore those when scanning.
 
 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
 
-Index: madwifi-trunk-r3776/net80211/ieee80211_scan_sta.c
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_scan_sta.c	2008-07-17 04:02:41.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_scan_sta.c	2008-07-17 04:03:54.000000000 +0200
+--- a/net80211/ieee80211_scan_sta.c
++++ b/net80211/ieee80211_scan_sta.c
 @@ -242,6 +242,10 @@
  	struct ieee80211_scan_entry *ise;
  	int hash;
diff --git a/package/madwifi/patches-r3776/323-crash_fix.patch b/package/madwifi/patches-r3776/323-crash_fix.patch
index ad75bff96f..2da3bf3525 100644
--- a/package/madwifi/patches-r3776/323-crash_fix.patch
+++ b/package/madwifi/patches-r3776/323-crash_fix.patch
@@ -1,7 +1,5 @@
-Index: madwifi-trunk-r3776/net80211/ieee80211_node.c
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_node.c	2008-07-17 02:56:18.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_node.c	2008-07-17 04:05:43.000000000 +0200
+--- a/net80211/ieee80211_node.c
++++ b/net80211/ieee80211_node.c
 @@ -1999,11 +1999,13 @@
  	/* From this point onwards we can no longer find the node,
  	 * so no more references are generated
diff --git a/package/madwifi/patches-r3776/324-reassoc.patch b/package/madwifi/patches-r3776/324-reassoc.patch
index 12c5b913c5..7d1ade3dd7 100644
--- a/package/madwifi/patches-r3776/324-reassoc.patch
+++ b/package/madwifi/patches-r3776/324-reassoc.patch
@@ -3,10 +3,8 @@ until we've figured out why it fails frequently.
 
 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
 
-Index: madwifi-trunk-r3776/net80211/ieee80211_node.c
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_node.c	2008-07-17 04:05:43.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_node.c	2008-07-17 04:05:55.000000000 +0200
+--- a/net80211/ieee80211_node.c
++++ b/net80211/ieee80211_node.c
 @@ -561,10 +561,9 @@
  EXPORT_SYMBOL(ieee80211_ibss_merge);
  
diff --git a/package/madwifi/patches-r3776/325-sta_node_leave.patch b/package/madwifi/patches-r3776/325-sta_node_leave.patch
index e1f51b61b2..6b0dcb8e80 100644
--- a/package/madwifi/patches-r3776/325-sta_node_leave.patch
+++ b/package/madwifi/patches-r3776/325-sta_node_leave.patch
@@ -3,10 +3,8 @@ Fixes some reassoc issues.
 
 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
 
-Index: madwifi-trunk-r3776/net80211/ieee80211_proto.c
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_proto.c	2008-07-17 02:20:51.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_proto.c	2008-07-17 04:06:47.000000000 +0200
+--- a/net80211/ieee80211_proto.c
++++ b/net80211/ieee80211_proto.c
 @@ -1352,7 +1352,7 @@
  				IEEE80211_SEND_MGMT(ni,
  					IEEE80211_FC0_SUBTYPE_DISASSOC,
diff --git a/package/madwifi/patches-r3776/326-bmiss_handling.patch b/package/madwifi/patches-r3776/326-bmiss_handling.patch
index 668c935547..0c72630503 100644
--- a/package/madwifi/patches-r3776/326-bmiss_handling.patch
+++ b/package/madwifi/patches-r3776/326-bmiss_handling.patch
@@ -5,10 +5,8 @@ for the APs probe response.
 
 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
 
-Index: madwifi-trunk-r3776/net80211/ieee80211_input.c
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_input.c	2008-07-17 04:03:07.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_input.c	2008-07-17 04:06:33.000000000 +0200
+--- a/net80211/ieee80211_input.c
++++ b/net80211/ieee80211_input.c
 @@ -3369,12 +3369,17 @@
  			}
  
@@ -31,10 +29,8 @@ Index: madwifi-trunk-r3776/net80211/ieee80211_input.c
  
  			/* If scanning, pass the info to the scan module.
  			 * Otherwise, check if it's the right time to do
-Index: madwifi-trunk-r3776/net80211/ieee80211_proto.c
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_proto.c	2008-07-17 04:06:18.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_proto.c	2008-07-17 04:06:33.000000000 +0200
+--- a/net80211/ieee80211_proto.c
++++ b/net80211/ieee80211_proto.c
 @@ -1213,6 +1213,8 @@
  	}
  	/* XXX locking */
@@ -94,10 +90,8 @@ Index: madwifi-trunk-r3776/net80211/ieee80211_proto.c
  			mod_timer(&vap->iv_swbmiss, jiffies + vap->iv_swbmiss_period);
  		}
  
-Index: madwifi-trunk-r3776/net80211/ieee80211_var.h
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_var.h	2008-07-17 04:03:07.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_var.h	2008-07-17 04:06:33.000000000 +0200
+--- a/net80211/ieee80211_var.h
++++ b/net80211/ieee80211_var.h
 @@ -292,6 +292,7 @@
  
  	struct timer_list iv_swbmiss;			/* software beacon miss timer */
diff --git a/package/madwifi/patches-r3776/327-rssi_disconnect.patch b/package/madwifi/patches-r3776/327-rssi_disconnect.patch
index 1ce8e2a718..b7e406cb04 100644
--- a/package/madwifi/patches-r3776/327-rssi_disconnect.patch
+++ b/package/madwifi/patches-r3776/327-rssi_disconnect.patch
@@ -3,10 +3,8 @@ when letting wpa_supplicant control roaming.
 
 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
 
-Index: madwifi-trunk-r3776/net80211/ieee80211_ioctl.h
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_ioctl.h	2008-07-17 04:03:30.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_ioctl.h	2008-07-17 04:07:29.000000000 +0200
+--- a/net80211/ieee80211_ioctl.h
++++ b/net80211/ieee80211_ioctl.h
 @@ -656,6 +656,8 @@
  	IEEE80211_PARAM_PROTMODE_RSSI		= 85,	/* RSSI Threshold for enabling protection mode */
  	IEEE80211_PARAM_PROTMODE_TIMEOUT	= 86,	/* Timeout for expiring protection mode */
@@ -16,10 +14,8 @@ Index: madwifi-trunk-r3776/net80211/ieee80211_ioctl.h
  };
  
  #define	SIOCG80211STATS			(SIOCDEVPRIVATE+2)
-Index: madwifi-trunk-r3776/net80211/ieee80211_wireless.c
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_wireless.c	2008-07-17 04:03:07.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_wireless.c	2008-07-17 04:07:56.000000000 +0200
+--- a/net80211/ieee80211_wireless.c
++++ b/net80211/ieee80211_wireless.c
 @@ -2832,6 +2832,12 @@
  	case IEEE80211_PARAM_ROAM_RATE_11G:
  		vap->iv_roam.rate11g = value;
@@ -61,10 +57,8 @@ Index: madwifi-trunk-r3776/net80211/ieee80211_wireless.c
  	{ IEEE80211_PARAM_UAPSDINFO,
  	  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "uapsd" },
  	{ IEEE80211_PARAM_UAPSDINFO,
-Index: madwifi-trunk-r3776/net80211/ieee80211_input.c
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_input.c	2008-07-17 04:07:08.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_input.c	2008-07-17 04:09:03.000000000 +0200
+--- a/net80211/ieee80211_input.c
++++ b/net80211/ieee80211_input.c
 @@ -3234,6 +3234,17 @@
  
  			/* When rssi is low, start doing bgscans more frequently to allow
@@ -83,10 +77,8 @@ Index: madwifi-trunk-r3776/net80211/ieee80211_input.c
  			if ((rssi < vap->iv_bgscanthr) &&
  					(!vap->iv_bgscanthr_next ||
  						!time_before(jiffies, vap->iv_bgscanthr_next)) &&
-Index: madwifi-trunk-r3776/net80211/ieee80211_var.h
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_var.h	2008-07-17 04:07:08.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_var.h	2008-07-17 04:07:10.000000000 +0200
+--- a/net80211/ieee80211_var.h
++++ b/net80211/ieee80211_var.h
 @@ -233,6 +233,9 @@
  	u_int iv_bgscanintvl;				/* bg scan min interval */
  	u_int iv_bgscanthr;					/* bg scan rssi threshold */
diff --git a/package/madwifi/patches-r3776/328-memory_alloc.patch b/package/madwifi/patches-r3776/328-memory_alloc.patch
index 18d648c613..ff60dbdb37 100644
--- a/package/madwifi/patches-r3776/328-memory_alloc.patch
+++ b/package/madwifi/patches-r3776/328-memory_alloc.patch
@@ -1,7 +1,5 @@
-Index: madwifi-trunk-r3776/ath/if_ath.c
-===================================================================
---- madwifi-trunk-r3776.orig/ath/if_ath.c	2008-07-17 04:00:42.000000000 +0200
-+++ madwifi-trunk-r3776/ath/if_ath.c	2008-07-17 04:11:45.000000000 +0200
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
 @@ -504,7 +504,7 @@
  
  	/* Allocate space for dynamically determined maximum VAP count */
diff --git a/package/madwifi/patches-r3776/329-turbo_chansearch.patch b/package/madwifi/patches-r3776/329-turbo_chansearch.patch
index 2c718c06e6..ba8b01c12f 100644
--- a/package/madwifi/patches-r3776/329-turbo_chansearch.patch
+++ b/package/madwifi/patches-r3776/329-turbo_chansearch.patch
@@ -1,7 +1,5 @@
-Index: madwifi-trunk-r3776/net80211/ieee80211.c
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211.c	2008-07-17 03:07:53.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211.c	2008-07-17 04:12:08.000000000 +0200
+--- a/net80211/ieee80211.c
++++ b/net80211/ieee80211.c
 @@ -695,6 +695,7 @@
  	int i;
  
diff --git a/package/madwifi/patches-r3776/330-bstuck_thresh.patch b/package/madwifi/patches-r3776/330-bstuck_thresh.patch
index e2e502dfbf..5f864bb59f 100644
--- a/package/madwifi/patches-r3776/330-bstuck_thresh.patch
+++ b/package/madwifi/patches-r3776/330-bstuck_thresh.patch
@@ -1,7 +1,5 @@
-Index: madwifi-trunk-r3776/ath/if_ath.c
-===================================================================
---- madwifi-trunk-r3776.orig/ath/if_ath.c	2008-07-17 04:11:45.000000000 +0200
-+++ madwifi-trunk-r3776/ath/if_ath.c	2008-07-17 04:12:51.000000000 +0200
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
 @@ -354,6 +354,7 @@
  static int ath_outdoor = AH_FALSE;		/* enable outdoor use */
  static int ath_xchanmode = AH_TRUE;		/* enable extended channels */
@@ -34,7 +32,7 @@ Index: madwifi-trunk-r3776/ath/if_ath.c
  MODULE_PARM_DESC(autocreate, "Create ath device in "
  		"[sta|ap|wds|adhoc|ahdemo|monitor] mode. defaults to sta, use "
  		"'none' to disable");
-@@ -5238,7 +5242,7 @@
+@@ -5239,7 +5243,7 @@
  		DPRINTF(sc, ATH_DEBUG_BEACON_PROC,
  			"Missed %u consecutive beacons (n_beacon=%u)\n",
  			sc->sc_bmisscount, n_beacon);
@@ -43,7 +41,7 @@ Index: madwifi-trunk-r3776/ath/if_ath.c
  			ATH_SCHEDULE_TQUEUE(&sc->sc_bstucktq, needmark);
  		return;
  	}
-@@ -5409,7 +5413,7 @@
+@@ -5410,7 +5414,7 @@
  	 *     check will be true, in which case return
  	 *     without resetting the driver.
  	 */
diff --git a/package/madwifi/patches-r3776/331-linux24_fix.patch b/package/madwifi/patches-r3776/331-linux24_fix.patch
index 968f37d71c..1d9a2d06c1 100644
--- a/package/madwifi/patches-r3776/331-linux24_fix.patch
+++ b/package/madwifi/patches-r3776/331-linux24_fix.patch
@@ -1,7 +1,5 @@
-Index: madwifi-trunk-r3776/ath_hal/Makefile
-===================================================================
---- madwifi-trunk-r3776.orig/ath_hal/Makefile	2008-07-17 00:21:30.000000000 +0200
-+++ madwifi-trunk-r3776/ath_hal/Makefile	2008-07-17 04:13:34.000000000 +0200
+--- a/ath_hal/Makefile
++++ b/ath_hal/Makefile
 @@ -79,10 +79,11 @@
  quiet_cmd_uudecode = UUDECODE $@
        cmd_uudecode = $(obj)/uudecode -o $@ $<
diff --git a/package/madwifi/patches-r3776/332-retransmit_check.patch b/package/madwifi/patches-r3776/332-retransmit_check.patch
index 2e2f919538..ec1fcf9c72 100644
--- a/package/madwifi/patches-r3776/332-retransmit_check.patch
+++ b/package/madwifi/patches-r3776/332-retransmit_check.patch
@@ -1,7 +1,5 @@
-Index: madwifi-trunk-r3776/net80211/ieee80211.h
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211.h	2008-07-17 04:14:08.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211.h	2008-07-17 04:14:13.000000000 +0200
+--- a/net80211/ieee80211.h
++++ b/net80211/ieee80211.h
 @@ -174,8 +174,6 @@
  #define	IEEE80211_SEQ_SEQ_MASK			0xfff0
  #define	IEEE80211_SEQ_SEQ_SHIFT			4
@@ -11,10 +9,8 @@ Index: madwifi-trunk-r3776/net80211/ieee80211.h
  #define	IEEE80211_NWID_LEN			32
  
  #define	IEEE80211_QOS_TXOP			0x00ff
-Index: madwifi-trunk-r3776/net80211/ieee80211_input.c
-===================================================================
---- madwifi-trunk-r3776.orig/net80211/ieee80211_input.c	2008-07-17 04:14:08.000000000 +0200
-+++ madwifi-trunk-r3776/net80211/ieee80211_input.c	2008-07-17 04:14:13.000000000 +0200
+--- a/net80211/ieee80211_input.c
++++ b/net80211/ieee80211_input.c
 @@ -406,7 +406,7 @@
  				tid = 0;
  			rxseq = le16toh(*(__le16 *)wh->i_seq);