qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-07-15 13:22:50 +03:00
Code

madwifi: refresh patches

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11316 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2008-06-01 03:01:58 +00:00
parent d2111ac59a
commit 70d0796247
39 changed files with 323 additions and 325 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
package/madwifi/patches/102-multicall_binary.patch
View File

@ -1,7 +1,7 @@
Index: madwifi-trunk-r3314/tools/80211debug.c Index: madwifi-trunk-r3314/tools/80211debug.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/tools/80211debug.c 2008-05-19 13:58:46.000000000 +0200 --- madwifi-trunk-r3314.orig/tools/80211debug.c
+++ madwifi-trunk-r3314/tools/80211debug.c 2008-05-19 14:15:10.000000000 +0200 +++ madwifi-trunk-r3314/tools/80211debug.c
@@ -48,6 +48,7 @@ @@ -48,6 +48,7 @@
#include <ctype.h> #include <ctype.h>
#include <getopt.h> #include <getopt.h>
@ -21,8 +21,8 @@ Index: madwifi-trunk-r3314/tools/80211debug.c
const char *cp, *tp; const char *cp, *tp;
Index: madwifi-trunk-r3314/tools/80211stats.c Index: madwifi-trunk-r3314/tools/80211stats.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/tools/80211stats.c 2008-05-19 13:58:46.000000000 +0200 --- madwifi-trunk-r3314.orig/tools/80211stats.c
+++ madwifi-trunk-r3314/tools/80211stats.c 2008-05-19 14:16:17.000000000 +0200 +++ madwifi-trunk-r3314/tools/80211stats.c
@@ -59,6 +59,7 @@ @@ -59,6 +59,7 @@
#include "net80211/ieee80211.h" #include "net80211/ieee80211.h"
#include "net80211/ieee80211_crypto.h" #include "net80211/ieee80211_crypto.h"
@ -42,8 +42,8 @@ Index: madwifi-trunk-r3314/tools/80211stats.c
struct ieee80211req_sta_info *si; struct ieee80211req_sta_info *si;
Index: madwifi-trunk-r3314/tools/athchans.c Index: madwifi-trunk-r3314/tools/athchans.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/tools/athchans.c 2008-05-19 13:58:46.000000000 +0200 --- madwifi-trunk-r3314.orig/tools/athchans.c
+++ madwifi-trunk-r3314/tools/athchans.c 2008-05-19 14:15:28.000000000 +0200 +++ madwifi-trunk-r3314/tools/athchans.c
@@ -58,6 +58,7 @@ @@ -58,6 +58,7 @@
#include "net80211/ieee80211.h" #include "net80211/ieee80211.h"
#include "net80211/ieee80211_crypto.h" #include "net80211/ieee80211_crypto.h"
@ -65,8 +65,8 @@ Index: madwifi-trunk-r3314/tools/athchans.c
struct ieee80211req_chanlist chanlist; struct ieee80211req_chanlist chanlist;
Index: madwifi-trunk-r3314/tools/athctrl.c Index: madwifi-trunk-r3314/tools/athctrl.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/tools/athctrl.c 2008-05-19 13:58:46.000000000 +0200 --- madwifi-trunk-r3314.orig/tools/athctrl.c
+++ madwifi-trunk-r3314/tools/athctrl.c 2008-05-19 14:15:44.000000000 +0200 +++ madwifi-trunk-r3314/tools/athctrl.c
@@ -52,6 +52,7 @@ @@ -52,6 +52,7 @@
#include <err.h> #include <err.h>
@ -86,8 +86,8 @@ Index: madwifi-trunk-r3314/tools/athctrl.c
int distance = -1; int distance = -1;
Index: madwifi-trunk-r3314/tools/athdebug.c Index: madwifi-trunk-r3314/tools/athdebug.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/tools/athdebug.c 2008-05-19 13:58:46.000000000 +0200 --- madwifi-trunk-r3314.orig/tools/athdebug.c
+++ madwifi-trunk-r3314/tools/athdebug.c 2008-05-19 14:15:59.000000000 +0200 +++ madwifi-trunk-r3314/tools/athdebug.c
@@ -51,6 +51,7 @@ @@ -51,6 +51,7 @@
#include <ctype.h> #include <ctype.h>
#include <getopt.h> #include <getopt.h>
@ -107,8 +107,8 @@ Index: madwifi-trunk-r3314/tools/athdebug.c
const char *ifname = "wifi0"; const char *ifname = "wifi0";
Index: madwifi-trunk-r3314/tools/athkey.c Index: madwifi-trunk-r3314/tools/athkey.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/tools/athkey.c 2008-05-19 13:58:46.000000000 +0200 --- madwifi-trunk-r3314.orig/tools/athkey.c
+++ madwifi-trunk-r3314/tools/athkey.c 2008-05-19 14:13:06.000000000 +0200 +++ madwifi-trunk-r3314/tools/athkey.c
@@ -58,6 +58,7 @@ @@ -58,6 +58,7 @@
#include "net80211/ieee80211.h" #include "net80211/ieee80211.h"
#include "net80211/ieee80211_crypto.h" #include "net80211/ieee80211_crypto.h"
@ -129,8 +129,8 @@ Index: madwifi-trunk-r3314/tools/athkey.c
struct ieee80211req_key setkey; struct ieee80211req_key setkey;
Index: madwifi-trunk-r3314/tools/athstats.c Index: madwifi-trunk-r3314/tools/athstats.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/tools/athstats.c 2008-05-19 13:58:46.000000000 +0200 --- madwifi-trunk-r3314.orig/tools/athstats.c
+++ madwifi-trunk-r3314/tools/athstats.c 2008-05-19 14:13:44.000000000 +0200 +++ madwifi-trunk-r3314/tools/athstats.c
@@ -65,6 +65,7 @@ @@ -65,6 +65,7 @@
#undef ARRAY_SIZE #undef ARRAY_SIZE
@ -150,8 +150,8 @@ Index: madwifi-trunk-r3314/tools/athstats.c
const char *ifname = "wifi0"; const char *ifname = "wifi0";
Index: madwifi-trunk-r3314/tools/do_multi.c Index: madwifi-trunk-r3314/tools/do_multi.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ madwifi-trunk-r3314/tools/do_multi.c 2008-05-19 14:56:28.000000000 +0200 +++ madwifi-trunk-r3314/tools/do_multi.c
@@ -0,0 +1,32 @@ @@ -0,0 +1,32 @@
+#include <string.h> +#include <string.h>
+#include "do_multi.h" +#include "do_multi.h"
@ -187,8 +187,8 @@ Index: madwifi-trunk-r3314/tools/do_multi.c
+} +}
Index: madwifi-trunk-r3314/tools/do_multi.h Index: madwifi-trunk-r3314/tools/do_multi.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ madwifi-trunk-r3314/tools/do_multi.h 2008-05-19 14:42:44.000000000 +0200 +++ madwifi-trunk-r3314/tools/do_multi.h
@@ -0,0 +1,15 @@ @@ -0,0 +1,15 @@
+#ifdef DO_MULTI +#ifdef DO_MULTI
+int a80211debug_init(int argc, char *argv[]); +int a80211debug_init(int argc, char *argv[]);
@ -207,8 +207,8 @@ Index: madwifi-trunk-r3314/tools/do_multi.h
+#endif +#endif
Index: madwifi-trunk-r3314/tools/Makefile Index: madwifi-trunk-r3314/tools/Makefile
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/tools/Makefile 2008-05-19 13:58:46.000000000 +0200 --- madwifi-trunk-r3314.orig/tools/Makefile
+++ madwifi-trunk-r3314/tools/Makefile 2008-05-19 14:56:55.000000000 +0200 +++ madwifi-trunk-r3314/tools/Makefile
@@ -46,56 +46,55 @@ @@ -46,56 +46,55 @@
HAL= $(TOP)/hal HAL= $(TOP)/hal
endif endif
@ -295,8 +295,8 @@ Index: madwifi-trunk-r3314/tools/Makefile
+ rm -f $(ALLPROGS) madwifi_multi *.o core a.out + rm -f $(ALLPROGS) madwifi_multi *.o core a.out
Index: madwifi-trunk-r3314/tools/wlanconfig.c Index: madwifi-trunk-r3314/tools/wlanconfig.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/tools/wlanconfig.c 2008-05-19 13:58:46.000000000 +0200 --- madwifi-trunk-r3314.orig/tools/wlanconfig.c
+++ madwifi-trunk-r3314/tools/wlanconfig.c 2008-05-19 14:14:07.000000000 +0200 +++ madwifi-trunk-r3314/tools/wlanconfig.c
@@ -61,6 +61,7 @@ @@ -61,6 +61,7 @@
#include "net80211/ieee80211.h" #include "net80211/ieee80211.h"
#include "net80211/ieee80211_crypto.h" #include "net80211/ieee80211_crypto.h"
@ -316,8 +316,8 @@ Index: madwifi-trunk-r3314/tools/wlanconfig.c
unsigned char bnounit = 0; unsigned char bnounit = 0;
Index: madwifi-trunk-r3314/tools/ath_info.c Index: madwifi-trunk-r3314/tools/ath_info.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/tools/ath_info.c 2008-05-19 13:58:46.000000000 +0200 --- madwifi-trunk-r3314.orig/tools/ath_info.c
+++ madwifi-trunk-r3314/tools/ath_info.c 2008-05-19 14:44:45.000000000 +0200 +++ madwifi-trunk-r3314/tools/ath_info.c
@@ -98,6 +98,7 @@ @@ -98,6 +98,7 @@
#include <sys/mman.h> #include <sys/mman.h>
#include <endian.h> #include <endian.h>

4
package/madwifi/patches/104-autocreate_none.patch
View File

@ -1,7 +1,7 @@
Index: madwifi-trunk-r3314/ath/if_ath.c Index: madwifi-trunk-r3314/ath/if_ath.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath/if_ath.c 2008-02-20 18:10:46.203147359 +0100 --- madwifi-trunk-r3314.orig/ath/if_ath.c
+++ madwifi-trunk-r3314/ath/if_ath.c 2008-02-20 18:10:47.047195460 +0100 +++ madwifi-trunk-r3314/ath/if_ath.c
@@ -516,7 +516,7 @@ @@ -516,7 +516,7 @@
HAL_STATUS status; HAL_STATUS status;
int error = 0; int error = 0;

4
package/madwifi/patches/105-ratectl_attach.patch
View File

@ -1,7 +1,7 @@
Index: madwifi-trunk-r3314/net80211/ieee80211_rate.c Index: madwifi-trunk-r3314/net80211/ieee80211_rate.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_rate.c 2008-02-20 18:10:46.171145535 +0100 --- madwifi-trunk-r3314.orig/net80211/ieee80211_rate.c
+++ madwifi-trunk-r3314/net80211/ieee80211_rate.c 2008-02-20 18:10:47.259207542 +0100 +++ madwifi-trunk-r3314/net80211/ieee80211_rate.c
@@ -100,8 +100,18 @@ @@ -100,8 +100,18 @@
ieee80211_load_module(buf); ieee80211_load_module(buf);

4
package/madwifi/patches/111-minstrel_crash.patch
View File

@ -1,7 +1,7 @@
Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.c 2008-02-20 18:10:46.143143939 +0100 --- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.c
+++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c 2008-02-20 18:10:47.471219622 +0100 +++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
@@ -393,6 +393,9 @@ @@ -393,6 +393,9 @@
struct minstrel_node *sn = ATH_NODE_MINSTREL(an); struct minstrel_node *sn = ATH_NODE_MINSTREL(an);
int rc1, rc2, rc3; /* Index into the rate table, so for example, it is 0..11 */ int rc1, rc2, rc3; /* Index into the rate table, so for example, it is 0..11 */

4
package/madwifi/patches/113-no_ibss_pwrsave.patch
View File

@ -1,7 +1,7 @@
Index: madwifi-trunk-r3314/net80211/ieee80211_scan.c Index: madwifi-trunk-r3314/net80211/ieee80211_scan.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_scan.c 2008-02-20 18:10:46.107141889 +0100 --- madwifi-trunk-r3314.orig/net80211/ieee80211_scan.c
+++ madwifi-trunk-r3314/net80211/ieee80211_scan.c 2008-02-20 18:10:47.679231478 +0100 +++ madwifi-trunk-r3314/net80211/ieee80211_scan.c
@@ -291,7 +291,8 @@ @@ -291,7 +291,8 @@
struct ieee80211com *ic = vap->iv_ic; struct ieee80211com *ic = vap->iv_ic;
int delay; int delay;

4
package/madwifi/patches/122-replayfail_workaround.patch
View File

@ -1,7 +1,7 @@
Index: madwifi-trunk-r3314/net80211/ieee80211_linux.c Index: madwifi-trunk-r3314/net80211/ieee80211_linux.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_linux.c 2008-02-20 18:10:46.075140065 +0100 --- madwifi-trunk-r3314.orig/net80211/ieee80211_linux.c
+++ madwifi-trunk-r3314/net80211/ieee80211_linux.c 2008-02-20 18:10:47.887243331 +0100 +++ madwifi-trunk-r3314/net80211/ieee80211_linux.c
@@ -331,6 +331,9 @@ @@ -331,6 +331,9 @@
k->wk_cipher->ic_name, k->wk_keyix, k->wk_cipher->ic_name, k->wk_keyix,
(unsigned long long)rsc); (unsigned long long)rsc);

4
package/madwifi/patches/123-ccmp_checks.patch
View File

@ -1,7 +1,7 @@
Index: madwifi-trunk-r3314/net80211/ieee80211_crypto_ccmp.c Index: madwifi-trunk-r3314/net80211/ieee80211_crypto_ccmp.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_crypto_ccmp.c 2008-02-20 18:10:46.043138240 +0100 --- madwifi-trunk-r3314.orig/net80211/ieee80211_crypto_ccmp.c
+++ madwifi-trunk-r3314/net80211/ieee80211_crypto_ccmp.c 2008-02-20 18:10:48.095255184 +0100 +++ madwifi-trunk-r3314/net80211/ieee80211_crypto_ccmp.c
@@ -475,6 +475,9 @@ @@ -475,6 +475,9 @@
uint8_t *mic, *pos; uint8_t *mic, *pos;
u_int space; u_int space;

16
package/madwifi/patches/124-linux24_compat.patch
View File

@ -1,7 +1,7 @@
Index: madwifi-trunk-r3314/ath/if_athvar.h Index: madwifi-trunk-r3314/ath/if_athvar.h
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath/if_athvar.h 2008-02-20 18:10:45.991135277 +0100 --- madwifi-trunk-r3314.orig/ath/if_athvar.h
+++ madwifi-trunk-r3314/ath/if_athvar.h 2008-02-20 18:10:48.307267266 +0100 +++ madwifi-trunk-r3314/ath/if_athvar.h
@@ -126,6 +126,11 @@ @@ -126,6 +126,11 @@
#define ATH_GET_NETDEV_DEV(ndev) ((ndev)->class_dev.dev) #define ATH_GET_NETDEV_DEV(ndev) ((ndev)->class_dev.dev)
#endif #endif
@ -16,8 +16,8 @@ Index: madwifi-trunk-r3314/ath/if_athvar.h
void (*setup)(struct net_device *)) void (*setup)(struct net_device *))
Index: madwifi-trunk-r3314/ath/if_ath_radar.c Index: madwifi-trunk-r3314/ath/if_ath_radar.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath/if_ath_radar.c 2008-02-20 18:10:45.999135735 +0100 --- madwifi-trunk-r3314.orig/ath/if_ath_radar.c
+++ madwifi-trunk-r3314/ath/if_ath_radar.c 2008-02-20 18:10:48.307267266 +0100 +++ madwifi-trunk-r3314/ath/if_ath_radar.c
@@ -92,6 +92,13 @@ @@ -92,6 +92,13 @@
#define nofloat_pct(_value, _pct) \ #define nofloat_pct(_value, _pct) \
( (_value * (1000 + _pct)) / 1000 ) ( (_value * (1000 + _pct)) / 1000 )
@ -34,8 +34,8 @@ Index: madwifi-trunk-r3314/ath/if_ath_radar.c
const char *name; const char *name;
Index: madwifi-trunk-r3314/ath/if_ath.c Index: madwifi-trunk-r3314/ath/if_ath.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath/if_ath.c 2008-02-20 18:10:47.047195460 +0100 --- madwifi-trunk-r3314.orig/ath/if_ath.c
+++ madwifi-trunk-r3314/ath/if_ath.c 2008-02-20 18:10:48.315267722 +0100 +++ madwifi-trunk-r3314/ath/if_ath.c
@@ -4705,6 +4705,46 @@ @@ -4705,6 +4705,46 @@
#undef USE_SHPREAMBLE #undef USE_SHPREAMBLE
} }
@ -85,8 +85,8 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
*/ */
Index: madwifi-trunk-r3314/net80211/sort.c Index: madwifi-trunk-r3314/net80211/sort.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null
+++ madwifi-trunk-r3314/net80211/sort.c 2008-02-20 18:10:48.319267951 +0100 +++ madwifi-trunk-r3314/net80211/sort.c
@@ -0,0 +1,120 @@ @@ -0,0 +1,120 @@
+/* +/*
+ * A fast, small, non-recursive O(nlog n) sort for the Linux kernel + * A fast, small, non-recursive O(nlog n) sort for the Linux kernel

4
package/madwifi/patches/126-rxerr_frames.patch
View File

@ -1,7 +1,7 @@
Index: madwifi-trunk-r3314/ath/if_ath.c Index: madwifi-trunk-r3314/ath/if_ath.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath/if_ath.c 2008-02-20 18:10:48.315267722 +0100 --- madwifi-trunk-r3314.orig/ath/if_ath.c
+++ madwifi-trunk-r3314/ath/if_ath.c 2008-02-20 18:10:48.567282084 +0100 +++ madwifi-trunk-r3314/ath/if_ath.c
@@ -6474,8 +6474,9 @@ @@ -6474,8 +6474,9 @@
/* /*
* Reject error frames if we have no vaps that * Reject error frames if we have no vaps that

60
package/madwifi/patches/200-no_debug.patch
View File

@ -1,7 +1,7 @@
Index: madwifi-trunk-r3314/ath/if_ath.c Index: madwifi-trunk-r3314/ath/if_ath.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath/if_ath.c 2008-05-19 14:54:42.000000000 +0200 --- madwifi-trunk-r3314.orig/ath/if_ath.c
+++ madwifi-trunk-r3314/ath/if_ath.c 2008-05-19 14:54:47.000000000 +0200 +++ madwifi-trunk-r3314/ath/if_ath.c
@@ -42,7 +42,6 @@ @@ -42,7 +42,6 @@
* This software is derived from work of Atsushi Onoe; his contribution * This software is derived from work of Atsushi Onoe; his contribution
* is greatly appreciated. * is greatly appreciated.
@ -103,8 +103,8 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
* necessary actions (such as a DFS reaction to radar). */ * necessary actions (such as a DFS reaction to radar). */
Index: madwifi-trunk-r3314/ath_rate/amrr/amrr.c Index: madwifi-trunk-r3314/ath_rate/amrr/amrr.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath_rate/amrr/amrr.c 2008-05-19 14:53:01.000000000 +0200 --- madwifi-trunk-r3314.orig/ath_rate/amrr/amrr.c
+++ madwifi-trunk-r3314/ath_rate/amrr/amrr.c 2008-05-19 14:54:47.000000000 +0200 +++ madwifi-trunk-r3314/ath_rate/amrr/amrr.c
@@ -70,7 +70,9 @@ @@ -70,7 +70,9 @@
#include "amrr.h" #include "amrr.h"
@ -117,8 +117,8 @@ Index: madwifi-trunk-r3314/ath_rate/amrr/amrr.c
if (sc->sc_debug & 0x10) \ if (sc->sc_debug & 0x10) \
Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.c 2008-05-19 14:54:42.000000000 +0200 --- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.c
+++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c 2008-05-19 14:54:47.000000000 +0200 +++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
@@ -117,7 +117,9 @@ @@ -117,7 +117,9 @@
#include "minstrel.h" #include "minstrel.h"
@ -131,8 +131,8 @@ Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
ATH_DEBUG_RATE = 0x00000010 /* rate control */ ATH_DEBUG_RATE = 0x00000010 /* rate control */
Index: madwifi-trunk-r3314/ath_rate/onoe/onoe.c Index: madwifi-trunk-r3314/ath_rate/onoe/onoe.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath_rate/onoe/onoe.c 2008-05-19 14:53:01.000000000 +0200 --- madwifi-trunk-r3314.orig/ath_rate/onoe/onoe.c
+++ madwifi-trunk-r3314/ath_rate/onoe/onoe.c 2008-05-19 14:54:47.000000000 +0200 +++ madwifi-trunk-r3314/ath_rate/onoe/onoe.c
@@ -66,7 +66,9 @@ @@ -66,7 +66,9 @@
#include "onoe.h" #include "onoe.h"
@ -145,8 +145,8 @@ Index: madwifi-trunk-r3314/ath_rate/onoe/onoe.c
ATH_DEBUG_RATE = 0x00000010, /* rate control */ ATH_DEBUG_RATE = 0x00000010, /* rate control */
Index: madwifi-trunk-r3314/ath_rate/sample/sample.c Index: madwifi-trunk-r3314/ath_rate/sample/sample.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath_rate/sample/sample.c 2008-05-19 14:53:01.000000000 +0200 --- madwifi-trunk-r3314.orig/ath_rate/sample/sample.c
+++ madwifi-trunk-r3314/ath_rate/sample/sample.c 2008-05-19 14:54:47.000000000 +0200 +++ madwifi-trunk-r3314/ath_rate/sample/sample.c
@@ -68,7 +68,9 @@ @@ -68,7 +68,9 @@
#include "sample.h" #include "sample.h"
@ -160,8 +160,8 @@ Index: madwifi-trunk-r3314/ath_rate/sample/sample.c
ATH_DEBUG_RATE = 0x00000010, /* rate control */ ATH_DEBUG_RATE = 0x00000010, /* rate control */
Index: madwifi-trunk-r3314/tools/do_multi.c Index: madwifi-trunk-r3314/tools/do_multi.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/tools/do_multi.c 2008-05-19 14:53:01.000000000 +0200 --- madwifi-trunk-r3314.orig/tools/do_multi.c
+++ madwifi-trunk-r3314/tools/do_multi.c 2008-05-19 14:54:47.000000000 +0200 +++ madwifi-trunk-r3314/tools/do_multi.c
@@ -9,16 +9,20 @@ @@ -9,16 +9,20 @@
progname = basename(argv[0]); progname = basename(argv[0]);
@ -185,8 +185,8 @@ Index: madwifi-trunk-r3314/tools/do_multi.c
if(strcmp(progname, "athstats") == 0) if(strcmp(progname, "athstats") == 0)
Index: madwifi-trunk-r3314/tools/Makefile Index: madwifi-trunk-r3314/tools/Makefile
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/tools/Makefile 2008-05-19 14:54:31.000000000 +0200 --- madwifi-trunk-r3314.orig/tools/Makefile
+++ madwifi-trunk-r3314/tools/Makefile 2008-05-19 14:55:14.000000000 +0200 +++ madwifi-trunk-r3314/tools/Makefile
@@ -48,6 +48,8 @@ @@ -48,6 +48,8 @@
all: compile all: compile
@ -207,8 +207,8 @@ Index: madwifi-trunk-r3314/tools/Makefile
Index: madwifi-trunk-r3314/net80211/ieee80211_linux.h Index: madwifi-trunk-r3314/net80211/ieee80211_linux.h
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_linux.h 2008-05-19 14:53:01.000000000 +0200 --- madwifi-trunk-r3314.orig/net80211/ieee80211_linux.h
+++ madwifi-trunk-r3314/net80211/ieee80211_linux.h 2008-05-19 14:54:47.000000000 +0200 +++ madwifi-trunk-r3314/net80211/ieee80211_linux.h
@@ -29,8 +29,6 @@ @@ -29,8 +29,6 @@
#ifndef _NET80211_IEEE80211_LINUX_H_ #ifndef _NET80211_IEEE80211_LINUX_H_
#define _NET80211_IEEE80211_LINUX_H_ #define _NET80211_IEEE80211_LINUX_H_
@ -220,8 +220,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_linux.h
#include <linux/wireless.h> #include <linux/wireless.h>
Index: madwifi-trunk-r3314/Makefile.inc Index: madwifi-trunk-r3314/Makefile.inc
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/Makefile.inc 2008-05-19 14:53:01.000000000 +0200 --- madwifi-trunk-r3314.orig/Makefile.inc
+++ madwifi-trunk-r3314/Makefile.inc 2008-05-19 14:54:47.000000000 +0200 +++ madwifi-trunk-r3314/Makefile.inc
@@ -148,7 +148,8 @@ @@ -148,7 +148,8 @@
TOOLS= $(TOP)/tools TOOLS= $(TOP)/tools
@ -234,8 +234,8 @@ Index: madwifi-trunk-r3314/Makefile.inc
# TARGET defines the target platform architecture. It must match one of # TARGET defines the target platform architecture. It must match one of
Index: madwifi-trunk-r3314/ath/if_ath_radar.c Index: madwifi-trunk-r3314/ath/if_ath_radar.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath/if_ath_radar.c 2008-05-19 14:54:42.000000000 +0200 --- madwifi-trunk-r3314.orig/ath/if_ath_radar.c
+++ madwifi-trunk-r3314/ath/if_ath_radar.c 2008-05-19 14:54:47.000000000 +0200 +++ madwifi-trunk-r3314/ath/if_ath_radar.c
@@ -19,8 +19,6 @@ @@ -19,8 +19,6 @@
* $Id: if_ath_radar.c 2464 2007-06-15 22:51:56Z mtaylor $ * $Id: if_ath_radar.c 2464 2007-06-15 22:51:56Z mtaylor $
*/ */
@ -256,8 +256,8 @@ Index: madwifi-trunk-r3314/ath/if_ath_radar.c
Index: madwifi-trunk-r3314/ath/if_ath_hal.h Index: madwifi-trunk-r3314/ath/if_ath_hal.h
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath/if_ath_hal.h 2008-05-19 14:53:01.000000000 +0200 --- madwifi-trunk-r3314.orig/ath/if_ath_hal.h
+++ madwifi-trunk-r3314/ath/if_ath_hal.h 2008-05-19 14:54:47.000000000 +0200 +++ madwifi-trunk-r3314/ath/if_ath_hal.h
@@ -1081,6 +1081,7 @@ @@ -1081,6 +1081,7 @@
tail -f /var/log/messages | sed -f hal_unmangle.sed tail -f /var/log/messages | sed -f hal_unmangle.sed
@ -277,8 +277,8 @@ Index: madwifi-trunk-r3314/ath/if_ath_hal.h
#endif /* #ifndef _IF_ATH_HAL_H_ */ #endif /* #ifndef _IF_ATH_HAL_H_ */
Index: madwifi-trunk-r3314/net80211/ieee80211_var.h Index: madwifi-trunk-r3314/net80211/ieee80211_var.h
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_var.h 2008-05-19 14:53:01.000000000 +0200 --- madwifi-trunk-r3314.orig/net80211/ieee80211_var.h
+++ madwifi-trunk-r3314/net80211/ieee80211_var.h 2008-05-19 14:54:47.000000000 +0200 +++ madwifi-trunk-r3314/net80211/ieee80211_var.h
@@ -492,9 +492,10 @@ @@ -492,9 +492,10 @@
/* inject a fake radar signal -- used while on a 802.11h DFS channels */ /* inject a fake radar signal -- used while on a 802.11h DFS channels */
unsigned int (*ic_test_radar)(struct ieee80211com *); unsigned int (*ic_test_radar)(struct ieee80211com *);
@ -293,8 +293,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_var.h
unsigned int (*ic_get_dfs_cac_time)(struct ieee80211com *); unsigned int (*ic_get_dfs_cac_time)(struct ieee80211com *);
Index: madwifi-trunk-r3314/net80211/ieee80211_wireless.c Index: madwifi-trunk-r3314/net80211/ieee80211_wireless.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_wireless.c 2008-05-19 14:53:01.000000000 +0200 --- madwifi-trunk-r3314.orig/net80211/ieee80211_wireless.c
+++ madwifi-trunk-r3314/net80211/ieee80211_wireless.c 2008-05-19 14:54:47.000000000 +0200 +++ madwifi-trunk-r3314/net80211/ieee80211_wireless.c
@@ -1548,6 +1548,7 @@ @@ -1548,6 +1548,7 @@
return 0; return 0;
} }
@ -335,8 +335,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_wireless.c
set_priv(IEEE80211_IOCTL_WDSADDMAC, ieee80211_ioctl_wdsmac), set_priv(IEEE80211_IOCTL_WDSADDMAC, ieee80211_ioctl_wdsmac),
Index: madwifi-trunk-r3314/ath/if_ath_debug.h Index: madwifi-trunk-r3314/ath/if_ath_debug.h
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath/if_ath_debug.h 2008-05-19 14:53:01.000000000 +0200 --- madwifi-trunk-r3314.orig/ath/if_ath_debug.h
+++ madwifi-trunk-r3314/ath/if_ath_debug.h 2008-05-19 14:54:47.000000000 +0200 +++ madwifi-trunk-r3314/ath/if_ath_debug.h
@@ -68,13 +68,6 @@ @@ -68,13 +68,6 @@
ath_keyprint((_sc), __func__, _ix, _hk, _mac); \ ath_keyprint((_sc), __func__, _ix, _hk, _mac); \
} while (0) } while (0)
@ -369,8 +369,8 @@ Index: madwifi-trunk-r3314/ath/if_ath_debug.h
#endif /* #ifndef _IF_ATH_DEBUG_H_ */ #endif /* #ifndef _IF_ATH_DEBUG_H_ */
Index: madwifi-trunk-r3314/net80211/ieee80211_node.c Index: madwifi-trunk-r3314/net80211/ieee80211_node.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_node.c 2008-05-19 14:53:01.000000000 +0200 --- madwifi-trunk-r3314.orig/net80211/ieee80211_node.c
+++ madwifi-trunk-r3314/net80211/ieee80211_node.c 2008-05-19 14:54:47.000000000 +0200 +++ madwifi-trunk-r3314/net80211/ieee80211_node.c
@@ -920,6 +920,9 @@ @@ -920,6 +920,9 @@
ni->ni_rxkeyoff = 0; ni->ni_rxkeyoff = 0;
} }

4
package/madwifi/patches/201-debug_fix.patch
View File

@ -1,7 +1,7 @@
Index: madwifi-trunk-r3314/ath_hal/ah_os.c Index: madwifi-trunk-r3314/ath_hal/ah_os.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath_hal/ah_os.c 2008-02-20 18:10:44.539052527 +0100 --- madwifi-trunk-r3314.orig/ath_hal/ah_os.c
+++ madwifi-trunk-r3314/ath_hal/ah_os.c 2008-02-20 18:10:55.159657761 +0100 +++ madwifi-trunk-r3314/ath_hal/ah_os.c
@@ -65,7 +65,7 @@ @@ -65,7 +65,7 @@
#include <ah_os.h> #include <ah_os.h>

66
package/madwifi/patches/300-napi_polling.patch
View File

@ -1,7 +1,7 @@
Index: madwifi-trunk-r3314/ath/if_ath.c Index: madwifi-trunk-r3314/ath/if_ath.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath/if_ath.c 2008-03-06 23:49:24.344018025 +0100 --- madwifi-trunk-r3314.orig/ath/if_ath.c
+++ madwifi-trunk-r3314/ath/if_ath.c 2008-03-07 00:38:01.010996975 +0100 +++ madwifi-trunk-r3314/ath/if_ath.c
@@ -184,7 +184,11 @@ @@ -184,7 +184,11 @@
struct sk_buff *, int, int, u_int64_t); struct sk_buff *, int, int, u_int64_t);
static void ath_setdefantenna(struct ath_softc *, u_int); static void ath_setdefantenna(struct ath_softc *, u_int);
@ -15,7 +15,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
static int ath_hardstart(struct sk_buff *, struct net_device *); static int ath_hardstart(struct sk_buff *, struct net_device *);
static int ath_mgtstart(struct ieee80211com *, struct sk_buff *); static int ath_mgtstart(struct ieee80211com *, struct sk_buff *);
#ifdef ATH_SUPERG_COMP #ifdef ATH_SUPERG_COMP
@@ -374,6 +378,9 @@ @@ -376,6 +380,9 @@
u_int32_t new_clamped_maxtxpower); u_int32_t new_clamped_maxtxpower);
static u_int32_t ath_get_real_maxtxpower(struct ath_softc *sc); static u_int32_t ath_get_real_maxtxpower(struct ath_softc *sc);
@ -25,7 +25,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
/* calibrate every 30 secs in steady state but check every second at first. */ /* calibrate every 30 secs in steady state but check every second at first. */
static int ath_calinterval = ATH_SHORT_CALINTERVAL; static int ath_calinterval = ATH_SHORT_CALINTERVAL;
static int ath_countrycode = CTRY_DEFAULT; /* country code */ static int ath_countrycode = CTRY_DEFAULT; /* country code */
@@ -545,7 +552,6 @@ @@ -547,7 +554,6 @@
atomic_set(&sc->sc_txbuf_counter, 0); atomic_set(&sc->sc_txbuf_counter, 0);
@ -33,7 +33,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
ATH_INIT_TQUEUE(&sc->sc_txtq, ath_tx_tasklet, dev); 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_bmisstq, ath_bmiss_tasklet, dev);
ATH_INIT_TQUEUE(&sc->sc_bstucktq, ath_bstuck_tasklet, dev); ATH_INIT_TQUEUE(&sc->sc_bstucktq, ath_bstuck_tasklet, dev);
@@ -819,6 +825,12 @@ @@ -821,6 +827,12 @@
dev->set_mac_address = ath_set_mac_address; dev->set_mac_address = ath_set_mac_address;
dev->change_mtu = ath_change_mtu; dev->change_mtu = ath_change_mtu;
dev->tx_queue_len = ATH_TXBUF - ATH_TXBUF_MGT_RESERVED; dev->tx_queue_len = ATH_TXBUF - ATH_TXBUF_MGT_RESERVED;
@ -46,7 +46,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
#ifdef USE_HEADERLEN_RESV #ifdef USE_HEADERLEN_RESV
dev->hard_header_len += sizeof(struct ieee80211_qosframe) + dev->hard_header_len += sizeof(struct ieee80211_qosframe) +
sizeof(struct llc) + sizeof(struct llc) +
@@ -2213,6 +2225,7 @@ @@ -2216,6 +2228,7 @@
(status & HAL_INT_GLOBAL) ? " HAL_INT_GLOBAL" : "" (status & HAL_INT_GLOBAL) ? " HAL_INT_GLOBAL" : ""
); );
@ -54,7 +54,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
status &= sc->sc_imask; /* discard unasked for bits */ status &= sc->sc_imask; /* discard unasked for bits */
/* As soon as we know we have a real interrupt we intend to service, /* As soon as we know we have a real interrupt we intend to service,
* we will check to see if we need an initial hardware TSF reading. * we will check to see if we need an initial hardware TSF reading.
@@ -2270,7 +2283,23 @@ @@ -2273,7 +2286,23 @@
} }
if (status & (HAL_INT_RX | HAL_INT_RXPHY)) { if (status & (HAL_INT_RX | HAL_INT_RXPHY)) {
ath_uapsd_processtriggers(sc, hw_tsf); ath_uapsd_processtriggers(sc, hw_tsf);
@ -79,7 +79,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
} }
if (status & HAL_INT_TX) { if (status & HAL_INT_TX) {
#ifdef ATH_SUPERG_DYNTURBO #ifdef ATH_SUPERG_DYNTURBO
@@ -2296,6 +2325,11 @@ @@ -2299,6 +2328,11 @@
} }
} }
#endif #endif
@ -91,7 +91,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
ATH_SCHEDULE_TQUEUE(&sc->sc_txtq, &needmark); ATH_SCHEDULE_TQUEUE(&sc->sc_txtq, &needmark);
} }
if (status & HAL_INT_BMISS) { if (status & HAL_INT_BMISS) {
@@ -2508,6 +2542,7 @@ @@ -2511,6 +2545,7 @@
if (sc->sc_tx99 != NULL) if (sc->sc_tx99 != NULL)
sc->sc_tx99->start(sc->sc_tx99); sc->sc_tx99->start(sc->sc_tx99);
#endif #endif
@ -99,7 +99,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
done: done:
ATH_UNLOCK(sc); ATH_UNLOCK(sc);
@@ -2548,6 +2583,9 @@ @@ -2551,6 +2586,9 @@
if (sc->sc_tx99 != NULL) if (sc->sc_tx99 != NULL)
sc->sc_tx99->stop(sc->sc_tx99); sc->sc_tx99->stop(sc->sc_tx99);
#endif #endif
@ -109,7 +109,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
netif_stop_queue(dev); /* XXX re-enabled by ath_newstate */ netif_stop_queue(dev); /* XXX re-enabled by ath_newstate */
dev->flags &= ~IFF_RUNNING; /* NB: avoid recursion */ dev->flags &= ~IFF_RUNNING; /* NB: avoid recursion */
ieee80211_stop_running(ic); /* stop all VAPs */ ieee80211_stop_running(ic); /* stop all VAPs */
@@ -4006,6 +4044,39 @@ @@ -4009,6 +4047,39 @@
return ath_keyset(sc, k, mac, vap->iv_bss); return ath_keyset(sc, k, mac, vap->iv_bss);
} }
@ -149,7 +149,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
/* /*
* Block/unblock tx+rx processing while a key change is done. * Block/unblock tx+rx processing while a key change is done.
* We assume the caller serializes key management operations * We assume the caller serializes key management operations
@@ -4023,13 +4094,7 @@ @@ -4026,13 +4097,7 @@
* When called from the rx tasklet we cannot use * When called from the rx tasklet we cannot use
* tasklet_disable because it will block waiting * tasklet_disable because it will block waiting
* for us to complete execution. * for us to complete execution.
@ -163,7 +163,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
netif_stop_queue(dev); netif_stop_queue(dev);
} }
@@ -4040,9 +4105,9 @@ @@ -4043,9 +4108,9 @@
struct ath_softc *sc = dev->priv; struct ath_softc *sc = dev->priv;
DPRINTF(sc, ATH_DEBUG_KEYCACHE, "End\n"); DPRINTF(sc, ATH_DEBUG_KEYCACHE, "End\n");
@ -176,7 +176,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
} }
/* /*
@@ -6347,15 +6412,25 @@ @@ -6350,15 +6415,25 @@
sc->sc_rxotherant = 0; sc->sc_rxotherant = 0;
} }
@ -206,7 +206,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
struct ieee80211com *ic = &sc->sc_ic; struct ieee80211com *ic = &sc->sc_ic;
struct ath_hal *ah = sc ? sc->sc_ah : NULL; struct ath_hal *ah = sc ? sc->sc_ah : NULL;
struct ath_desc *ds; struct ath_desc *ds;
@@ -6365,8 +6440,10 @@ @@ -6368,8 +6443,10 @@
unsigned int len; unsigned int len;
int type; int type;
u_int phyerr; u_int phyerr;
@ -217,7 +217,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
do { do {
bf = STAILQ_FIRST(&sc->sc_rxbuf); bf = STAILQ_FIRST(&sc->sc_rxbuf);
if (bf == NULL) { /* XXX ??? can this happen */ if (bf == NULL) { /* XXX ??? can this happen */
@@ -6390,6 +6467,15 @@ @@ -6393,6 +6470,15 @@
/* NB: never process the self-linked entry at the end */ /* NB: never process the self-linked entry at the end */
break; break;
} }
@ -233,7 +233,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
skb = bf->bf_skb; skb = bf->bf_skb;
if (skb == NULL) { if (skb == NULL) {
EPRINTF(sc, "Dropping; buffer contains NULL skbuff.\n"); EPRINTF(sc, "Dropping; buffer contains NULL skbuff.\n");
@@ -6437,6 +6523,7 @@ @@ -6440,6 +6526,7 @@
sc->sc_stats.ast_rx_phyerr++; sc->sc_stats.ast_rx_phyerr++;
phyerr = rs->rs_phyerr & 0x1f; phyerr = rs->rs_phyerr & 0x1f;
sc->sc_stats.ast_rx_phy[phyerr]++; sc->sc_stats.ast_rx_phy[phyerr]++;
@ -241,7 +241,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
} }
if (rs->rs_status & HAL_RXERR_DECRYPT) { if (rs->rs_status & HAL_RXERR_DECRYPT) {
/* /*
@@ -6632,9 +6719,43 @@ @@ -6635,9 +6722,43 @@
STAILQ_INSERT_TAIL(&sc->sc_rxbuf, bf, bf_list); STAILQ_INSERT_TAIL(&sc->sc_rxbuf, bf, bf_list);
ATH_RXBUF_UNLOCK_IRQ(sc); ATH_RXBUF_UNLOCK_IRQ(sc);
} while (ath_rxbuf_init(sc, bf) == 0); } while (ath_rxbuf_init(sc, bf) == 0);
@ -285,7 +285,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
#undef PA2DESC #undef PA2DESC
} }
@@ -8285,12 +8406,24 @@ @@ -8288,12 +8409,24 @@
{ {
struct net_device *dev = (struct net_device *)data; struct net_device *dev = (struct net_device *)data;
struct ath_softc *sc = dev->priv; struct ath_softc *sc = dev->priv;
@ -310,7 +310,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
netif_wake_queue(dev); netif_wake_queue(dev);
if (sc->sc_softled) if (sc->sc_softled)
@@ -8306,7 +8439,9 @@ @@ -8309,7 +8442,9 @@
{ {
struct net_device *dev = (struct net_device *)data; struct net_device *dev = (struct net_device *)data;
struct ath_softc *sc = dev->priv; struct ath_softc *sc = dev->priv;
@ -320,7 +320,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
/* /*
* Process each active queue. * Process each active queue.
*/ */
@@ -8327,6 +8462,16 @@ @@ -8330,6 +8465,16 @@
if (sc->sc_uapsdq && txqactive(sc->sc_ah, sc->sc_uapsdq->axq_qnum)) if (sc->sc_uapsdq && txqactive(sc->sc_ah, sc->sc_uapsdq->axq_qnum))
ath_tx_processq(sc, sc->sc_uapsdq); ath_tx_processq(sc, sc->sc_uapsdq);
@ -337,7 +337,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
netif_wake_queue(dev); netif_wake_queue(dev);
if (sc->sc_softled) if (sc->sc_softled)
@@ -8342,13 +8487,25 @@ @@ -8345,13 +8490,25 @@
struct net_device *dev = (struct net_device *)data; struct net_device *dev = (struct net_device *)data;
struct ath_softc *sc = dev->priv; struct ath_softc *sc = dev->priv;
unsigned int i; unsigned int i;
@ -363,7 +363,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
netif_wake_queue(dev); netif_wake_queue(dev);
if (sc->sc_softled) if (sc->sc_softled)
@@ -10281,9 +10439,9 @@ @@ -10284,9 +10441,9 @@
dev->mtu = mtu; dev->mtu = mtu;
if ((dev->flags & IFF_RUNNING) && !sc->sc_invalid) { if ((dev->flags & IFF_RUNNING) && !sc->sc_invalid) {
/* NB: the rx buffers may need to be reallocated */ /* NB: the rx buffers may need to be reallocated */
@ -377,8 +377,8 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
Index: madwifi-trunk-r3314/ath/if_athvar.h Index: madwifi-trunk-r3314/ath/if_athvar.h
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath/if_athvar.h 2008-03-06 23:49:24.296015306 +0100 --- madwifi-trunk-r3314.orig/ath/if_athvar.h
+++ madwifi-trunk-r3314/ath/if_athvar.h 2008-03-07 00:34:32.792958008 +0100 +++ madwifi-trunk-r3314/ath/if_athvar.h
@@ -53,6 +53,10 @@ @@ -53,6 +53,10 @@
# include <asm/bitops.h> # include <asm/bitops.h>
#endif #endif
@ -427,8 +427,8 @@ Index: madwifi-trunk-r3314/ath/if_athvar.h
#define ATH_RXBUF_LOCK_DESTROY(_sc) #define ATH_RXBUF_LOCK_DESTROY(_sc)
Index: madwifi-trunk-r3314/net80211/ieee80211_input.c Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c 2008-03-06 23:49:11.027259154 +0100 --- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c
+++ madwifi-trunk-r3314/net80211/ieee80211_input.c 2008-03-07 00:34:41.589459294 +0100 +++ madwifi-trunk-r3314/net80211/ieee80211_input.c
@@ -1198,7 +1198,7 @@ @@ -1198,7 +1198,7 @@
/* attach vlan tag */ /* attach vlan tag */
struct ieee80211_node *ni_tmp = SKB_CB(skb)->ni; struct ieee80211_node *ni_tmp = SKB_CB(skb)->ni;
@ -462,8 +462,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
/* node reference was leaked */ /* node reference was leaked */
Index: madwifi-trunk-r3314/net80211/ieee80211_monitor.c Index: madwifi-trunk-r3314/net80211/ieee80211_monitor.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_monitor.c 2008-03-06 23:49:11.031259383 +0100 --- madwifi-trunk-r3314.orig/net80211/ieee80211_monitor.c
+++ madwifi-trunk-r3314/net80211/ieee80211_monitor.c 2008-03-07 00:33:59.235045655 +0100 +++ madwifi-trunk-r3314/net80211/ieee80211_monitor.c
@@ -584,8 +584,8 @@ @@ -584,8 +584,8 @@
skb1->protocol = skb1->protocol =
__constant_htons(0x0019); /* ETH_P_80211_RAW */ __constant_htons(0x0019); /* ETH_P_80211_RAW */
@ -477,8 +477,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_monitor.c
if (SKB_CB(skb1)->ni != NULL) if (SKB_CB(skb1)->ni != NULL)
Index: madwifi-trunk-r3314/net80211/ieee80211_skb.c Index: madwifi-trunk-r3314/net80211/ieee80211_skb.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_skb.c 2008-03-06 23:49:11.039259840 +0100 --- madwifi-trunk-r3314.orig/net80211/ieee80211_skb.c
+++ madwifi-trunk-r3314/net80211/ieee80211_skb.c 2008-03-06 23:49:24.384020316 +0100 +++ madwifi-trunk-r3314/net80211/ieee80211_skb.c
@@ -73,7 +73,7 @@ @@ -73,7 +73,7 @@
#undef dev_queue_xmit #undef dev_queue_xmit
#undef kfree_skb #undef kfree_skb
@ -510,8 +510,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_skb.c
EXPORT_SYMBOL(skb_clone_debug); EXPORT_SYMBOL(skb_clone_debug);
Index: madwifi-trunk-r3314/net80211/ieee80211_skb.h Index: madwifi-trunk-r3314/net80211/ieee80211_skb.h
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_skb.h 2008-03-06 23:49:11.047260294 +0100 --- madwifi-trunk-r3314.orig/net80211/ieee80211_skb.h
+++ madwifi-trunk-r3314/net80211/ieee80211_skb.h 2008-03-06 23:49:24.384020316 +0100 +++ madwifi-trunk-r3314/net80211/ieee80211_skb.h
@@ -116,7 +116,7 @@ @@ -116,7 +116,7 @@
int vlan_hwaccel_receive_skb_debug(struct sk_buff *skb, int vlan_hwaccel_receive_skb_debug(struct sk_buff *skb,
struct vlan_group *grp, unsigned short vlan_tag, struct vlan_group *grp, unsigned short vlan_tag,

24
package/madwifi/patches/305-pureg_fix.patch
View File

@ -1,8 +1,8 @@
Index: madwifi-trunk-r3314/ath/if_ath.c Index: madwifi-trunk-r3314/ath/if_ath.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath/if_ath.c 2008-02-20 21:57:41.025078273 +0100 --- madwifi-trunk-r3314.orig/ath/if_ath.c
+++ madwifi-trunk-r3314/ath/if_ath.c 2008-02-20 21:57:44.393270217 +0100 +++ madwifi-trunk-r3314/ath/if_ath.c
@@ -4146,7 +4146,9 @@ @@ -4149,7 +4149,9 @@
rfilt |= HAL_RX_FILTER_PROM; rfilt |= HAL_RX_FILTER_PROM;
if (ic->ic_opmode == IEEE80211_M_STA || if (ic->ic_opmode == IEEE80211_M_STA ||
sc->sc_opmode == HAL_M_IBSS || /* NB: AHDEMO too */ sc->sc_opmode == HAL_M_IBSS || /* NB: AHDEMO too */
@ -15,8 +15,8 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
rfilt |= (HAL_RX_FILTER_CONTROL | HAL_RX_FILTER_BEACON | rfilt |= (HAL_RX_FILTER_CONTROL | HAL_RX_FILTER_BEACON |
Index: madwifi-trunk-r3314/net80211/ieee80211_input.c Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c 2008-02-20 21:57:41.037078957 +0100 --- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c
+++ madwifi-trunk-r3314/net80211/ieee80211_input.c 2008-02-20 21:57:44.401270672 +0100 +++ madwifi-trunk-r3314/net80211/ieee80211_input.c
@@ -346,11 +346,12 @@ @@ -346,11 +346,12 @@
bssid = wh->i_addr3; bssid = wh->i_addr3;
} }
@ -110,8 +110,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
*/ */
Index: madwifi-trunk-r3314/net80211/ieee80211_node.c Index: madwifi-trunk-r3314/net80211/ieee80211_node.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_node.c 2008-02-20 21:56:33.629237604 +0100 --- madwifi-trunk-r3314.orig/net80211/ieee80211_node.c
+++ madwifi-trunk-r3314/net80211/ieee80211_node.c 2008-02-20 21:57:44.409271127 +0100 +++ madwifi-trunk-r3314/net80211/ieee80211_node.c
@@ -383,10 +383,16 @@ @@ -383,10 +383,16 @@
/* Update country ie information */ /* Update country ie information */
ieee80211_build_countryie(ic); ieee80211_build_countryie(ic);
@ -133,8 +133,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_node.c
} }
Index: madwifi-trunk-r3314/net80211/ieee80211_proto.c Index: madwifi-trunk-r3314/net80211/ieee80211_proto.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_proto.c 2008-02-20 21:56:33.633237829 +0100 --- madwifi-trunk-r3314.orig/net80211/ieee80211_proto.c
+++ madwifi-trunk-r3314/net80211/ieee80211_proto.c 2008-02-20 21:57:44.413271357 +0100 +++ madwifi-trunk-r3314/net80211/ieee80211_proto.c
@@ -595,6 +595,28 @@ @@ -595,6 +595,28 @@
{ 4, { 2, 4, 11, 22 } }, /* IEEE80211_MODE_TURBO_G (mixed b/g) */ { 4, { 2, 4, 11, 22 } }, /* IEEE80211_MODE_TURBO_G (mixed b/g) */
}; };
@ -166,9 +166,9 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_proto.c
* specified mode. For 11b compatibility we mark only 11b * specified mode. For 11b compatibility we mark only 11b
Index: madwifi-trunk-r3314/net80211/ieee80211_var.h Index: madwifi-trunk-r3314/net80211/ieee80211_var.h
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_var.h 2008-02-20 21:56:33.645238517 +0100 --- madwifi-trunk-r3314.orig/net80211/ieee80211_var.h
+++ madwifi-trunk-r3314/net80211/ieee80211_var.h 2008-02-20 21:57:44.417271583 +0100 +++ madwifi-trunk-r3314/net80211/ieee80211_var.h
@@ -707,6 +707,7 @@ @@ -708,6 +708,7 @@
void ieee80211_build_sc_ie(struct ieee80211com *); void ieee80211_build_sc_ie(struct ieee80211com *);
void ieee80211_dfs_action(struct ieee80211com *); void ieee80211_dfs_action(struct ieee80211com *);
void ieee80211_expire_channel_excl_restrictions(struct ieee80211com *); void ieee80211_expire_channel_excl_restrictions(struct ieee80211com *);

56
package/madwifi/patches/309-micfail_detect.patch
View File

@ -1,8 +1,8 @@
Index: madwifi-trunk-r3314/ath/if_ath.c Index: madwifi-trunk-r3314/ath/if_ath.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath/if_ath.c 2008-02-20 21:55:41.314256342 +0100 --- madwifi-trunk-r3314.orig/ath/if_ath.c
+++ madwifi-trunk-r3314/ath/if_ath.c 2008-02-20 21:56:10.819937775 +0100 +++ madwifi-trunk-r3314/ath/if_ath.c
@@ -6443,6 +6443,7 @@ @@ -6446,6 +6446,7 @@
int type; int type;
u_int phyerr; u_int phyerr;
u_int processed = 0, early_stop = 0; u_int processed = 0, early_stop = 0;
@ -10,7 +10,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
DPRINTF(sc, ATH_DEBUG_RX_PROC, "invoked\n"); DPRINTF(sc, ATH_DEBUG_RX_PROC, "invoked\n");
process_rx_again: process_rx_again:
@@ -6544,24 +6545,8 @@ @@ -6547,24 +6548,8 @@
} }
if (rs->rs_status & HAL_RXERR_MIC) { if (rs->rs_status & HAL_RXERR_MIC) {
sc->sc_stats.ast_rx_badmic++; sc->sc_stats.ast_rx_badmic++;
@ -37,7 +37,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
} }
/* /*
* Reject error frames if we have no vaps that * Reject error frames if we have no vaps that
@@ -6600,8 +6585,9 @@ @@ -6603,8 +6588,9 @@
/* /*
* Finished monitor mode handling, now reject * Finished monitor mode handling, now reject
* error frames before passing to other vaps * error frames before passing to other vaps
@ -48,7 +48,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
ieee80211_dev_kfree_skb(&skb); ieee80211_dev_kfree_skb(&skb);
goto rx_next; goto rx_next;
} }
@@ -6609,6 +6595,26 @@ @@ -6612,6 +6598,26 @@
/* remove the CRC */ /* remove the CRC */
skb_trim(skb, skb->len - IEEE80211_CRC_LEN); skb_trim(skb, skb->len - IEEE80211_CRC_LEN);
@ -75,7 +75,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
/* /*
* From this point on we assume the frame is at least * From this point on we assume the frame is at least
* as large as ieee80211_frame_min; verify that. * as large as ieee80211_frame_min; verify that.
@@ -6621,6 +6627,7 @@ @@ -6624,6 +6630,7 @@
goto rx_next; goto rx_next;
} }
@ -85,8 +85,8 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
*/ */
Index: madwifi-trunk-r3314/net80211/ieee80211_crypto_ccmp.c Index: madwifi-trunk-r3314/net80211/ieee80211_crypto_ccmp.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_crypto_ccmp.c 2008-02-20 21:52:06.822033125 +0100 --- madwifi-trunk-r3314.orig/net80211/ieee80211_crypto_ccmp.c
+++ madwifi-trunk-r3314/net80211/ieee80211_crypto_ccmp.c 2008-02-20 21:55:45.302483625 +0100 +++ madwifi-trunk-r3314/net80211/ieee80211_crypto_ccmp.c
@@ -73,7 +73,7 @@ @@ -73,7 +73,7 @@
static int ccmp_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t); static int ccmp_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t);
static int ccmp_decap(struct ieee80211_key *, struct sk_buff *, int); static int ccmp_decap(struct ieee80211_key *, struct sk_buff *, int);
@ -107,8 +107,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_crypto_ccmp.c
} }
Index: madwifi-trunk-r3314/net80211/ieee80211_crypto.h Index: madwifi-trunk-r3314/net80211/ieee80211_crypto.h
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_crypto.h 2008-02-20 21:50:40.149093918 +0100 --- madwifi-trunk-r3314.orig/net80211/ieee80211_crypto.h
+++ madwifi-trunk-r3314/net80211/ieee80211_crypto.h 2008-02-20 21:55:45.310484070 +0100 +++ madwifi-trunk-r3314/net80211/ieee80211_crypto.h
@@ -145,7 +145,7 @@ @@ -145,7 +145,7 @@
int (*ic_encap)(struct ieee80211_key *, struct sk_buff *, u_int8_t); int (*ic_encap)(struct ieee80211_key *, struct sk_buff *, u_int8_t);
int (*ic_decap)(struct ieee80211_key *, struct sk_buff *, int); int (*ic_decap)(struct ieee80211_key *, struct sk_buff *, int);
@ -133,8 +133,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_crypto.h
/* /*
Index: madwifi-trunk-r3314/net80211/ieee80211_crypto_none.c Index: madwifi-trunk-r3314/net80211/ieee80211_crypto_none.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_crypto_none.c 2008-02-20 21:50:40.153094148 +0100 --- madwifi-trunk-r3314.orig/net80211/ieee80211_crypto_none.c
+++ madwifi-trunk-r3314/net80211/ieee80211_crypto_none.c 2008-02-20 21:55:45.314484297 +0100 +++ madwifi-trunk-r3314/net80211/ieee80211_crypto_none.c
@@ -52,7 +52,7 @@ @@ -52,7 +52,7 @@
static int none_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t); static int none_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t);
static int none_decap(struct ieee80211_key *, struct sk_buff *, int); static int none_decap(struct ieee80211_key *, struct sk_buff *, int);
@ -155,8 +155,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_crypto_none.c
Index: madwifi-trunk-r3314/net80211/ieee80211_crypto_tkip.c Index: madwifi-trunk-r3314/net80211/ieee80211_crypto_tkip.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_crypto_tkip.c 2008-02-20 21:50:40.161094600 +0100 --- madwifi-trunk-r3314.orig/net80211/ieee80211_crypto_tkip.c
+++ madwifi-trunk-r3314/net80211/ieee80211_crypto_tkip.c 2008-02-20 21:55:45.314484297 +0100 +++ madwifi-trunk-r3314/net80211/ieee80211_crypto_tkip.c
@@ -57,7 +57,7 @@ @@ -57,7 +57,7 @@
static int tkip_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t); static int tkip_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t);
static int tkip_enmic(struct ieee80211_key *, struct sk_buff *, int); static int tkip_enmic(struct ieee80211_key *, struct sk_buff *, int);
@ -186,8 +186,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_crypto_tkip.c
u8 mic0[IEEE80211_WEP_MICLEN]; u8 mic0[IEEE80211_WEP_MICLEN];
Index: madwifi-trunk-r3314/net80211/ieee80211_crypto_wep.c Index: madwifi-trunk-r3314/net80211/ieee80211_crypto_wep.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_crypto_wep.c 2008-02-20 21:50:40.169095058 +0100 --- madwifi-trunk-r3314.orig/net80211/ieee80211_crypto_wep.c
+++ madwifi-trunk-r3314/net80211/ieee80211_crypto_wep.c 2008-02-20 21:55:45.314484297 +0100 +++ madwifi-trunk-r3314/net80211/ieee80211_crypto_wep.c
@@ -54,7 +54,7 @@ @@ -54,7 +54,7 @@
static int wep_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t); static int wep_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t);
static int wep_decap(struct ieee80211_key *, struct sk_buff *, int); static int wep_decap(struct ieee80211_key *, struct sk_buff *, int);
@ -208,8 +208,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_crypto_wep.c
} }
Index: madwifi-trunk-r3314/net80211/ieee80211_input.c Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c 2008-02-20 21:55:41.318256570 +0100 --- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c
+++ madwifi-trunk-r3314/net80211/ieee80211_input.c 2008-02-20 21:55:45.318484528 +0100 +++ madwifi-trunk-r3314/net80211/ieee80211_input.c
@@ -669,7 +669,7 @@ @@ -669,7 +669,7 @@
* Next strip any MSDU crypto bits. * Next strip any MSDU crypto bits.
*/ */
@ -269,8 +269,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
* Debugging support. * Debugging support.
Index: madwifi-trunk-r3314/net80211/ieee80211_proto.h Index: madwifi-trunk-r3314/net80211/ieee80211_proto.h
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_proto.h 2008-02-20 21:50:40.185095969 +0100 --- madwifi-trunk-r3314.orig/net80211/ieee80211_proto.h
+++ madwifi-trunk-r3314/net80211/ieee80211_proto.h 2008-02-20 21:55:45.318484528 +0100 +++ madwifi-trunk-r3314/net80211/ieee80211_proto.h
@@ -90,6 +90,7 @@ @@ -90,6 +90,7 @@
void ieee80211_set11gbasicrates(struct ieee80211_rateset *, enum ieee80211_phymode); void ieee80211_set11gbasicrates(struct ieee80211_rateset *, enum ieee80211_phymode);
enum ieee80211_phymode ieee80211_get11gbasicrates(struct ieee80211_rateset *); enum ieee80211_phymode ieee80211_get11gbasicrates(struct ieee80211_rateset *);
@ -281,8 +281,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_proto.h
* Return the size of the 802.11 header for a management or data frame. * Return the size of the 802.11 header for a management or data frame.
Index: madwifi-trunk-r3314/net80211/ieee80211_linux.c Index: madwifi-trunk-r3314/net80211/ieee80211_linux.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_linux.c 2008-02-20 21:52:06.810032443 +0100 --- madwifi-trunk-r3314.orig/net80211/ieee80211_linux.c
+++ madwifi-trunk-r3314/net80211/ieee80211_linux.c 2008-02-20 21:55:45.318484528 +0100 +++ madwifi-trunk-r3314/net80211/ieee80211_linux.c
@@ -337,8 +337,8 @@ @@ -337,8 +337,8 @@
/* TODO: needed parameters: count, keyid, key type, src address, TSC */ /* TODO: needed parameters: count, keyid, key type, src address, TSC */
snprintf(buf, sizeof(buf), "%s(keyid=%d %scast addr=" MAC_FMT ")", tag, snprintf(buf, sizeof(buf), "%s(keyid=%d %scast addr=" MAC_FMT ")", tag,
@ -296,8 +296,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_linux.c
wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf); wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf);
Index: madwifi-trunk-r3314/net80211/ieee80211_output.c Index: madwifi-trunk-r3314/net80211/ieee80211_output.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_output.c 2008-02-20 21:50:40.197096654 +0100 --- madwifi-trunk-r3314.orig/net80211/ieee80211_output.c
+++ madwifi-trunk-r3314/net80211/ieee80211_output.c 2008-02-20 21:55:45.326484992 +0100 +++ madwifi-trunk-r3314/net80211/ieee80211_output.c
@@ -1074,13 +1074,16 @@ @@ -1074,13 +1074,16 @@
cip = (struct ieee80211_cipher *) key->wk_cipher; cip = (struct ieee80211_cipher *) key->wk_cipher;
ciphdrsize = cip->ic_header; ciphdrsize = cip->ic_header;
@ -320,9 +320,9 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_output.c
* Allocate sk_buff for each subsequent fragment; First fragment * Allocate sk_buff for each subsequent fragment; First fragment
Index: madwifi-trunk-r3314/net80211/ieee80211_node.c Index: madwifi-trunk-r3314/net80211/ieee80211_node.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_node.c 2008-02-20 21:55:41.318256570 +0100 --- madwifi-trunk-r3314.orig/net80211/ieee80211_node.c
+++ madwifi-trunk-r3314/net80211/ieee80211_node.c 2008-02-20 21:55:45.326484992 +0100 +++ madwifi-trunk-r3314/net80211/ieee80211_node.c
@@ -2261,11 +2261,13 @@ @@ -2264,11 +2264,13 @@
/* From this point onwards we can no longer find the node, /* From this point onwards we can no longer find the node,
* so no more references are generated * so no more references are generated
*/ */

18
package/madwifi/patches/310-noise_get.patch
View File

@ -1,7 +1,7 @@
Index: madwifi-trunk-r3314/ath/if_ath.c Index: madwifi-trunk-r3314/ath/if_ath.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath/if_ath.c 2008-03-07 01:53:50.021034889 +0100 --- madwifi-trunk-r3314.orig/ath/if_ath.c
+++ madwifi-trunk-r3314/ath/if_ath.c 2008-03-07 01:54:31.203381737 +0100 +++ madwifi-trunk-r3314/ath/if_ath.c
@@ -1695,8 +1695,6 @@ @@ -1695,8 +1695,6 @@
* get to reality. This value is used in monitor mode and by tools like * get to reality. This value is used in monitor mode and by tools like
* Wireshark and Kismet. * Wireshark and Kismet.
@ -11,7 +11,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
ATH_RXBUF_LOCK_IRQ(sc); ATH_RXBUF_LOCK_IRQ(sc);
if (sc->sc_rxbufcur == NULL) if (sc->sc_rxbufcur == NULL)
sc->sc_rxbufcur = STAILQ_FIRST(&sc->sc_rxbuf); sc->sc_rxbufcur = STAILQ_FIRST(&sc->sc_rxbuf);
@@ -8967,6 +8965,7 @@ @@ -8966,6 +8964,7 @@
sc->sc_curchan.channel); sc->sc_curchan.channel);
sc->sc_stats.ast_per_calfail++; sc->sc_stats.ast_per_calfail++;
} }
@ -19,7 +19,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
ath_hal_process_noisefloor(ah); ath_hal_process_noisefloor(ah);
if (isIQdone == AH_TRUE) { if (isIQdone == AH_TRUE) {
@@ -9035,6 +9034,7 @@ @@ -9034,6 +9033,7 @@
struct ath_softc *sc = dev->priv; struct ath_softc *sc = dev->priv;
(void) ath_chan_set(sc, ic->ic_curchan); (void) ath_chan_set(sc, ic->ic_curchan);
@ -27,7 +27,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
/* /*
* If we are returning to our bss channel then mark state * 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 * so the next recv'd beacon's TSF will be used to sync the
@@ -9303,6 +9303,7 @@ @@ -9302,6 +9302,7 @@
} }
ath_hal_process_noisefloor(ah); ath_hal_process_noisefloor(ah);
@ -37,8 +37,8 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
*/ */
Index: madwifi-trunk-r3314/net80211/ieee80211_wireless.c Index: madwifi-trunk-r3314/net80211/ieee80211_wireless.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_wireless.c 2008-03-07 01:53:48.708960118 +0100 --- madwifi-trunk-r3314.orig/net80211/ieee80211_wireless.c
+++ madwifi-trunk-r3314/net80211/ieee80211_wireless.c 2008-03-07 01:54:31.211382196 +0100 +++ madwifi-trunk-r3314/net80211/ieee80211_wireless.c
@@ -4358,6 +4358,7 @@ @@ -4358,6 +4358,7 @@
si->isi_state = ni->ni_flags; si->isi_state = ni->ni_flags;
si->isi_authmode = ni->ni_authmode; si->isi_authmode = ni->ni_authmode;
@ -49,8 +49,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_wireless.c
si->isi_erp = ni->ni_erp; si->isi_erp = ni->ni_erp;
Index: madwifi-trunk-r3314/net80211/ieee80211_ioctl.h Index: madwifi-trunk-r3314/net80211/ieee80211_ioctl.h
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_ioctl.h 2008-03-07 01:53:48.440944845 +0100 --- madwifi-trunk-r3314.orig/net80211/ieee80211_ioctl.h
+++ madwifi-trunk-r3314/net80211/ieee80211_ioctl.h 2008-03-07 01:54:31.211382196 +0100 +++ madwifi-trunk-r3314/net80211/ieee80211_ioctl.h
@@ -311,6 +311,7 @@ @@ -311,6 +311,7 @@
u_int16_t isi_state; /* state flags */ u_int16_t isi_state; /* state flags */
u_int8_t isi_authmode; /* authentication algorithm */ u_int8_t isi_authmode; /* authentication algorithm */

6
package/madwifi/patches/311-bssid_alloc.patch
View File

@ -1,8 +1,8 @@
Index: madwifi-trunk-r3314/ath/if_ath.c Index: madwifi-trunk-r3314/ath/if_ath.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath/if_ath.c 2008-02-20 21:57:55.057877957 +0100 --- madwifi-trunk-r3314.orig/ath/if_ath.c
+++ madwifi-trunk-r3314/ath/if_ath.c 2008-02-20 21:57:58.494073773 +0100 +++ madwifi-trunk-r3314/ath/if_ath.c
@@ -1351,7 +1351,7 @@ @@ -1354,7 +1354,7 @@
TAILQ_FOREACH(v, &ic->ic_vaps, iv_next) TAILQ_FOREACH(v, &ic->ic_vaps, iv_next)
id_mask |= (1 << ATH_GET_VAP_ID(v->iv_myaddr)); id_mask |= (1 << ATH_GET_VAP_ID(v->iv_myaddr));

18
package/madwifi/patches/312-erpupdate.patch
View File

@ -1,7 +1,7 @@
Index: madwifi-trunk-r3314/net80211/ieee80211_beacon.c Index: madwifi-trunk-r3314/net80211/ieee80211_beacon.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_beacon.c 2008-02-20 18:10:45.515108151 +0100 --- madwifi-trunk-r3314.orig/net80211/ieee80211_beacon.c
+++ madwifi-trunk-r3314/net80211/ieee80211_beacon.c 2008-02-20 18:10:50.491391734 +0100 +++ madwifi-trunk-r3314/net80211/ieee80211_beacon.c
@@ -542,10 +542,10 @@ @@ -542,10 +542,10 @@
vap->iv_flags &= ~IEEE80211_F_XRUPDATE; vap->iv_flags &= ~IEEE80211_F_XRUPDATE;
} }
@ -17,8 +17,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_beacon.c
/* if it is a mode change beacon for dynamic turbo case */ /* if it is a mode change beacon for dynamic turbo case */
Index: madwifi-trunk-r3314/net80211/ieee80211_input.c Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c 2008-02-20 18:10:49.723347963 +0100 --- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c
+++ madwifi-trunk-r3314/net80211/ieee80211_input.c 2008-02-20 18:10:50.495391960 +0100 +++ madwifi-trunk-r3314/net80211/ieee80211_input.c
@@ -3431,9 +3431,12 @@ @@ -3431,9 +3431,12 @@
/* Assume no ERP IE == 11b AP */ /* Assume no ERP IE == 11b AP */
if ((!has_erp || (has_erp && (scan.erp & IEEE80211_ERP_NON_ERP_PRESENT))) && if ((!has_erp || (has_erp && (scan.erp & IEEE80211_ERP_NON_ERP_PRESENT))) &&
@ -35,9 +35,9 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
Index: madwifi-trunk-r3314/net80211/ieee80211_node.c Index: madwifi-trunk-r3314/net80211/ieee80211_node.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_node.c 2008-02-20 18:10:49.727348192 +0100 --- madwifi-trunk-r3314.orig/net80211/ieee80211_node.c
+++ madwifi-trunk-r3314/net80211/ieee80211_node.c 2008-02-20 18:10:50.507392644 +0100 +++ madwifi-trunk-r3314/net80211/ieee80211_node.c
@@ -2022,8 +2022,12 @@ @@ -2025,8 +2025,12 @@
} }
/* Update ERP element if this is first non ERP station */ /* Update ERP element if this is first non ERP station */
@ -52,7 +52,7 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_node.c
} else } else
ni->ni_flags |= IEEE80211_NODE_ERP; ni->ni_flags |= IEEE80211_NODE_ERP;
} }
@@ -2226,6 +2230,8 @@ @@ -2229,6 +2233,8 @@
IEEE80211_NOTE(vap, IEEE80211_MSG_ASSOC, ni, IEEE80211_NOTE(vap, IEEE80211_MSG_ASSOC, ni,
"non-ERP station leaves, count now %d", ic->ic_nonerpsta); "non-ERP station leaves, count now %d", ic->ic_nonerpsta);
if (ic->ic_nonerpsta == 0) { if (ic->ic_nonerpsta == 0) {
@ -61,7 +61,7 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_node.c
IEEE80211_DPRINTF(vap, IEEE80211_MSG_ASSOC, IEEE80211_DPRINTF(vap, IEEE80211_MSG_ASSOC,
"%s: disable use of protection\n", __func__); "%s: disable use of protection\n", __func__);
ic->ic_flags &= ~IEEE80211_F_USEPROT; ic->ic_flags &= ~IEEE80211_F_USEPROT;
@@ -2237,7 +2243,9 @@ @@ -2240,7 +2246,9 @@
ic->ic_flags |= IEEE80211_F_SHPREAMBLE; ic->ic_flags |= IEEE80211_F_SHPREAMBLE;
ic->ic_flags &= ~IEEE80211_F_USEBARKER; ic->ic_flags &= ~IEEE80211_F_USEBARKER;
} }

6
package/madwifi/patches/317-bmask.patch
View File

@ -1,8 +1,8 @@
Index: madwifi-trunk-r3314/ath/if_ath.c Index: madwifi-trunk-r3314/ath/if_ath.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath/if_ath.c 2008-02-20 21:57:58.494073773 +0100 --- madwifi-trunk-r3314.orig/ath/if_ath.c
+++ madwifi-trunk-r3314/ath/if_ath.c 2008-02-20 21:58:14.318975583 +0100 +++ madwifi-trunk-r3314/ath/if_ath.c
@@ -8673,6 +8673,10 @@ @@ -8680,6 +8680,10 @@
sc->sc_rxbufcur = NULL; sc->sc_rxbufcur = NULL;

12
package/madwifi/patches/323-dfs_optional.patch
View File

@ -1,8 +1,8 @@
Index: madwifi-trunk-r3314/ath/if_ath.c Index: madwifi-trunk-r3314/ath/if_ath.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath/if_ath.c 2008-02-20 21:58:51.885116355 +0100 --- madwifi-trunk-r3314.orig/ath/if_ath.c
+++ madwifi-trunk-r3314/ath/if_ath.c 2008-02-20 21:58:53.697219623 +0100 +++ madwifi-trunk-r3314/ath/if_ath.c
@@ -1771,17 +1771,14 @@ @@ -1774,17 +1774,14 @@
* may have occurred in the intervening timeframe. */ * may have occurred in the intervening timeframe. */
bf->bf_channoise = ic->ic_channoise; bf->bf_channoise = ic->ic_channoise;
@ -29,9 +29,9 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
bus_dma_sync_single(sc->sc_bdev, bf->bf_skbaddr, bus_dma_sync_single(sc->sc_bdev, bf->bf_skbaddr,
Index: madwifi-trunk-r3314/ath/if_ath_radar.c Index: madwifi-trunk-r3314/ath/if_ath_radar.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath/if_ath_radar.c 2008-02-20 21:58:35.060157557 +0100 --- madwifi-trunk-r3314.orig/ath/if_ath_radar.c
+++ madwifi-trunk-r3314/ath/if_ath_radar.c 2008-02-20 21:58:53.701219858 +0100 +++ madwifi-trunk-r3314/ath/if_ath_radar.c
@@ -263,7 +263,7 @@ @@ -261,7 +261,7 @@
unsigned int new_rxfilt = old_rxfilt; unsigned int new_rxfilt = old_rxfilt;
ath_hal_intrset(ah, old_ier & ~HAL_INT_GLOBAL); ath_hal_intrset(ah, old_ier & ~HAL_INT_GLOBAL);

4
package/madwifi/patches/324-alignment.patch
View File

@ -1,7 +1,7 @@
Index: madwifi-trunk-r3314/net80211/ieee80211_input.c Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c 2008-02-20 18:10:50.495391960 +0100 --- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c
+++ madwifi-trunk-r3314/net80211/ieee80211_input.c 2008-02-20 18:10:51.395443250 +0100 +++ madwifi-trunk-r3314/net80211/ieee80211_input.c
@@ -1275,14 +1275,8 @@ @@ -1275,14 +1275,8 @@
eh->ether_type = ether_type; eh->ether_type = ether_type;

10
package/madwifi/patches/325-channel_spam.patch
View File

@ -1,8 +1,8 @@
Index: madwifi-trunk-r3314/ath/if_ath.c Index: madwifi-trunk-r3314/ath/if_ath.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath/if_ath.c 2008-02-20 21:58:53.697219623 +0100 --- madwifi-trunk-r3314.orig/ath/if_ath.c
+++ madwifi-trunk-r3314/ath/if_ath.c 2008-02-20 21:58:58.545495909 +0100 +++ madwifi-trunk-r3314/ath/if_ath.c
@@ -9776,7 +9776,9 @@ @@ -9783,7 +9783,9 @@
/* /*
* Convert HAL channels to ieee80211 ones. * Convert HAL channels to ieee80211 ones.
*/ */
@ -12,7 +12,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
for (i = 0; i < nchan; i++) { for (i = 0; i < nchan; i++) {
HAL_CHANNEL *c = &chans[i]; HAL_CHANNEL *c = &chans[i];
struct ieee80211_channel *ichan = &ic->ic_channels[i]; struct ieee80211_channel *ichan = &ic->ic_channels[i];
@@ -9803,6 +9805,7 @@ @@ -9810,6 +9812,7 @@
ic->ic_chan_non_occupy[i].tv_sec = 0; ic->ic_chan_non_occupy[i].tv_sec = 0;
ic->ic_chan_non_occupy[i].tv_usec = 0; ic->ic_chan_non_occupy[i].tv_usec = 0;
@ -20,7 +20,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
IPRINTF(sc, "Channel %3d (%4d MHz) Max Tx Power %d dBm%s " IPRINTF(sc, "Channel %3d (%4d MHz) Max Tx Power %d dBm%s "
"[%d hw %d reg] Flags%s%s%s%s%s%s%s%s%s%s%s%s%" "[%d hw %d reg] Flags%s%s%s%s%s%s%s%s%s%s%s%s%"
"s%s%s%s%s%s%s%s%s%s%s%s\n", "s%s%s%s%s%s%s%s%s%s%s%s\n",
@@ -9891,6 +9894,7 @@ @@ -9898,6 +9901,7 @@
(c->privFlags & 0x0080 ? (c->privFlags & 0x0080 ?
" PF & (1 << 7)" : "") " PF & (1 << 7)" : "")
); );

14
package/madwifi/patches/327-queue.patch
View File

@ -1,8 +1,8 @@
Index: madwifi-trunk-r3314/ath/if_ath.c Index: madwifi-trunk-r3314/ath/if_ath.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath/if_ath.c 2008-02-20 21:58:58.545495909 +0100 --- madwifi-trunk-r3314.orig/ath/if_ath.c
+++ madwifi-trunk-r3314/ath/if_ath.c 2008-02-20 21:59:01.609670527 +0100 +++ madwifi-trunk-r3314/ath/if_ath.c
@@ -8423,8 +8423,6 @@ @@ -8431,8 +8431,6 @@
ath_hal_intrset(sc->sc_ah, sc->sc_imask); ath_hal_intrset(sc->sc_ah, sc->sc_imask);
local_irq_restore(flags); local_irq_restore(flags);
@ -11,7 +11,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
if (sc->sc_softled) if (sc->sc_softled)
ath_led_event(sc, ATH_LED_TX); ath_led_event(sc, ATH_LED_TX);
} }
@@ -8471,8 +8469,6 @@ @@ -8479,8 +8477,6 @@
ath_hal_intrset(sc->sc_ah, sc->sc_imask); ath_hal_intrset(sc->sc_ah, sc->sc_imask);
local_irq_restore(flags); local_irq_restore(flags);
@ -20,7 +20,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
if (sc->sc_softled) if (sc->sc_softled)
ath_led_event(sc, ATH_LED_TX); ath_led_event(sc, ATH_LED_TX);
} }
@@ -8505,8 +8501,6 @@ @@ -8513,8 +8509,6 @@
ath_hal_intrset(sc->sc_ah, sc->sc_imask); ath_hal_intrset(sc->sc_ah, sc->sc_imask);
local_irq_restore(flags); local_irq_restore(flags);
@ -31,8 +31,8 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
} }
Index: madwifi-trunk-r3314/net80211/ieee80211_input.c Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c 2008-02-20 21:58:57.425432087 +0100 --- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c
+++ madwifi-trunk-r3314/net80211/ieee80211_input.c 2008-02-20 21:59:01.613670756 +0100 +++ madwifi-trunk-r3314/net80211/ieee80211_input.c
@@ -1132,7 +1132,7 @@ @@ -1132,7 +1132,7 @@
(vap->iv_flags & IEEE80211_F_NOBRIDGE) == 0) { (vap->iv_flags & IEEE80211_F_NOBRIDGE) == 0) {
struct sk_buff *skb1 = NULL; struct sk_buff *skb1 = NULL;

36
package/madwifi/patches/330-beaconcal.patch
View File

@ -1,8 +1,8 @@
Index: madwifi-trunk-r3314/ath/if_ath.c Index: madwifi-trunk-r3314/ath/if_ath.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath/if_ath.c 2008-02-20 21:59:04.037808900 +0100 --- madwifi-trunk-r3314.orig/ath/if_ath.c
+++ madwifi-trunk-r3314/ath/if_ath.c 2008-02-20 21:59:07.426001981 +0100 +++ madwifi-trunk-r3314/ath/if_ath.c
@@ -395,6 +395,7 @@ @@ -397,6 +397,7 @@
static int maxvaps = -1; static int maxvaps = -1;
static int outdoor = -1; static int outdoor = -1;
static int xchanmode = -1; static int xchanmode = -1;
@ -10,7 +10,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
static const char *hal_status_desc[] = { static const char *hal_status_desc[] = {
"No error", "No error",
@@ -420,6 +421,7 @@ @@ -422,6 +423,7 @@
}; };
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,52)) #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,52))
@ -18,7 +18,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
MODULE_PARM(countrycode, "i"); MODULE_PARM(countrycode, "i");
MODULE_PARM(maxvaps, "i"); MODULE_PARM(maxvaps, "i");
MODULE_PARM(outdoor, "i"); MODULE_PARM(outdoor, "i");
@@ -432,6 +434,7 @@ @@ -434,6 +436,7 @@
MODULE_PARM(ratectl, "s"); MODULE_PARM(ratectl, "s");
#else #else
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
@ -26,7 +26,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
module_param(countrycode, int, 0600); module_param(countrycode, int, 0600);
module_param(maxvaps, int, 0600); module_param(maxvaps, int, 0600);
module_param(outdoor, int, 0600); module_param(outdoor, int, 0600);
@@ -2595,7 +2598,8 @@ @@ -2598,7 +2601,8 @@
} }
if (!sc->sc_invalid) { if (!sc->sc_invalid) {
del_timer_sync(&sc->sc_dfs_cac_timer); del_timer_sync(&sc->sc_dfs_cac_timer);
@ -36,7 +36,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
} }
ath_draintxq(sc); ath_draintxq(sc);
if (!sc->sc_invalid) { if (!sc->sc_invalid) {
@@ -2612,6 +2616,20 @@ @@ -2615,6 +2619,20 @@
return 0; return 0;
} }
@ -57,7 +57,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
/* /*
* Stop the device, grabbing the top-level lock to protect * Stop the device, grabbing the top-level lock to protect
* against concurrent entry through ath_init (which can happen * against concurrent entry through ath_init (which can happen
@@ -2737,6 +2755,12 @@ @@ -2740,6 +2758,12 @@
HAL_STATUS status; HAL_STATUS status;
/* /*
@ -70,7 +70,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
* Convert to a HAL channel description with the flags * Convert to a HAL channel description with the flags
* constrained to reflect the current operating mode. * constrained to reflect the current operating mode.
*/ */
@@ -5142,6 +5166,8 @@ @@ -5145,6 +5169,8 @@
"Invoking ath_hal_txstart with sc_bhalq: %d\n", "Invoking ath_hal_txstart with sc_bhalq: %d\n",
sc->sc_bhalq); sc->sc_bhalq);
ath_hal_txstart(ah, sc->sc_bhalq); ath_hal_txstart(ah, sc->sc_bhalq);
@ -79,7 +79,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
sc->sc_stats.ast_be_xmit++; /* XXX per-VAP? */ sc->sc_stats.ast_be_xmit++; /* XXX per-VAP? */
} }
@@ -5391,6 +5417,7 @@ @@ -5394,6 +5420,7 @@
ath_hal_beacontimers(ah, &bs); ath_hal_beacontimers(ah, &bs);
sc->sc_imask |= HAL_INT_BMISS; sc->sc_imask |= HAL_INT_BMISS;
ath_hal_intrset(ah, sc->sc_imask); ath_hal_intrset(ah, sc->sc_imask);
@ -87,7 +87,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
} else { } else {
ath_hal_intrset(ah, 0); ath_hal_intrset(ah, 0);
if (reset_tsf) if (reset_tsf)
@@ -5402,8 +5429,11 @@ @@ -5405,8 +5432,11 @@
*/ */
intval |= HAL_BEACON_ENA; intval |= HAL_BEACON_ENA;
sc->sc_imask |= HAL_INT_SWBA; sc->sc_imask |= HAL_INT_SWBA;
@ -100,7 +100,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
#ifdef ATH_SUPERG_DYNTURBO #ifdef ATH_SUPERG_DYNTURBO
ath_beacon_dturbo_config(vap, intval & ath_beacon_dturbo_config(vap, intval &
~(HAL_BEACON_RESET_TSF | HAL_BEACON_ENA)); ~(HAL_BEACON_RESET_TSF | HAL_BEACON_ENA));
@@ -8864,6 +8894,9 @@ @@ -8870,6 +8900,9 @@
/* Enter DFS wait period */ /* Enter DFS wait period */
mod_timer(&sc->sc_dfs_cac_timer, mod_timer(&sc->sc_dfs_cac_timer,
jiffies + (sc->sc_dfs_cac_period * HZ)); jiffies + (sc->sc_dfs_cac_period * HZ));
@ -110,7 +110,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
} }
/* /*
* re configure beacons when it is a turbo mode switch. * re configure beacons when it is a turbo mode switch.
@@ -8973,8 +9006,11 @@ @@ -8979,8 +9012,11 @@
sc->sc_curchan.channel, sc->sc_curchan.channelFlags, sc->sc_curchan.channel, sc->sc_curchan.channelFlags,
isIQdone ? "done" : "not done"); isIQdone ? "done" : "not done");
@ -124,7 +124,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
} }
static void static void
@@ -9081,7 +9117,8 @@ @@ -9087,7 +9123,8 @@
ieee80211_state_name[vap->iv_state], ieee80211_state_name[vap->iv_state],
ieee80211_state_name[nstate]); ieee80211_state_name[nstate]);
@ -134,7 +134,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
ath_hal_setledstate(ah, leds[nstate]); /* set LED */ ath_hal_setledstate(ah, leds[nstate]); /* set LED */
netif_stop_queue(dev); /* before we do anything else */ netif_stop_queue(dev); /* before we do anything else */
@@ -9306,7 +9343,8 @@ @@ -9312,7 +9349,8 @@
"VAP -> DFSWAIT_PENDING \n"); "VAP -> DFSWAIT_PENDING \n");
/* start calibration timer with a really small value /* start calibration timer with a really small value
* 1/10 sec */ * 1/10 sec */
@ -144,7 +144,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
/* wake the receiver */ /* wake the receiver */
netif_wake_queue(dev); netif_wake_queue(dev);
/* don't do the other usual stuff... */ /* don't do the other usual stuff... */
@@ -9349,7 +9387,7 @@ @@ -9355,7 +9393,7 @@
error = avp->av_newstate(vap, nstate, arg); error = avp->av_newstate(vap, nstate, arg);
/* Finally, start any timers. */ /* Finally, start any timers. */
@ -155,8 +155,8 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
} }
Index: madwifi-trunk-r3314/ath/if_athvar.h Index: madwifi-trunk-r3314/ath/if_athvar.h
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath/if_athvar.h 2008-02-20 21:58:38.148333545 +0100 --- madwifi-trunk-r3314.orig/ath/if_athvar.h
+++ madwifi-trunk-r3314/ath/if_athvar.h 2008-02-20 21:59:07.426001981 +0100 +++ madwifi-trunk-r3314/ath/if_athvar.h
@@ -778,6 +778,8 @@ @@ -778,6 +778,8 @@
struct ieee80211vap **sc_bslot; /* beacon xmit slots */ struct ieee80211vap **sc_bslot; /* beacon xmit slots */
int sc_bnext; /* next slot for beacon xmit */ int sc_bnext; /* next slot for beacon xmit */

8
package/madwifi/patches/331-memory_alloc.patch
View File

@ -1,8 +1,8 @@
Index: madwifi-trunk-r3314/ath/if_ath.c Index: madwifi-trunk-r3314/ath/if_ath.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath/if_ath.c 2008-02-20 18:10:52.499506168 +0100 --- madwifi-trunk-r3314.orig/ath/if_ath.c
+++ madwifi-trunk-r3314/ath/if_ath.c 2008-02-20 18:10:52.731519391 +0100 +++ madwifi-trunk-r3314/ath/if_ath.c
@@ -3315,17 +3315,18 @@ @@ -3318,17 +3318,18 @@
* without affecting any other bridge ports. */ * without affecting any other bridge ports. */
if (skb_cloned(skb)) { if (skb_cloned(skb)) {
/* Remember the original SKB so we can free up our references */ /* Remember the original SKB so we can free up our references */
@ -27,7 +27,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
eh = (struct ether_header *)skb->data; eh = (struct ether_header *)skb->data;
#ifdef ATH_SUPERG_FF #ifdef ATH_SUPERG_FF
@@ -3596,6 +3597,8 @@ @@ -3599,6 +3600,8 @@
sc->sc_stats.ast_tx_mgmt++; sc->sc_stats.ast_tx_mgmt++;
return 0; return 0;
bad: bad:

7
package/madwifi/patches/332-reset_beacons.patch
View File

@ -1,8 +1,8 @@
Index: madwifi-trunk-r3314/ath/if_ath.c Index: madwifi-trunk-r3314/ath/if_ath.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath/if_ath.c 2008-02-20 22:22:50.203268987 +0100 --- madwifi-trunk-r3314.orig/ath/if_ath.c
+++ madwifi-trunk-r3314/ath/if_ath.c 2008-02-20 22:23:25.745294410 +0100 +++ madwifi-trunk-r3314/ath/if_ath.c
@@ -8905,7 +8915,7 @@ @@ -8911,7 +8911,7 @@
* re configure beacons when it is a turbo mode switch. * re configure beacons when it is a turbo mode switch.
* HW seems to turn off beacons during turbo mode switch. * HW seems to turn off beacons during turbo mode switch.
*/ */
@ -11,4 +11,3 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
ath_beacon_config(sc, NULL); ath_beacon_config(sc, NULL);
/* /*
* Re-enable interrupts. * Re-enable interrupts.

7
package/madwifi/patches/333-apscan_mode.patch
View File

@ -1,8 +1,8 @@
Index: madwifi-trunk-r3314/net80211/ieee80211_scan_ap.c Index: madwifi-trunk-r3314/net80211/ieee80211_scan_ap.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_scan_ap.c 2008-02-21 02:42:12.885287851 +0100 --- madwifi-trunk-r3314.orig/net80211/ieee80211_scan_ap.c
+++ madwifi-trunk-r3314/net80211/ieee80211_scan_ap.c 2008-02-21 02:42:34.718532055 +0100 +++ madwifi-trunk-r3314/net80211/ieee80211_scan_ap.c
@@ -781,12 +783,6 @@ @@ -781,12 +781,6 @@
/* break the loop as the subsequent chans won't be /* break the loop as the subsequent chans won't be
* better */ * better */
break; break;
@ -15,4 +15,3 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_scan_ap.c
} }
if (sta_assoc != 0) { if (sta_assoc != 0) {

4
package/madwifi/patches/334-input.patch
View File

@ -1,7 +1,7 @@
Index: madwifi-trunk-r3314/net80211/ieee80211_input.c Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c 2008-02-29 01:31:47.601395974 +0100 --- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c
+++ madwifi-trunk-r3314/net80211/ieee80211_input.c 2008-02-29 01:35:46.545089077 +0100 +++ madwifi-trunk-r3314/net80211/ieee80211_input.c
@@ -950,6 +950,9 @@ @@ -950,6 +950,9 @@
TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) { TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) {
struct sk_buff *skb1; struct sk_buff *skb1;

24
package/madwifi/patches/340-maxrate.patch
View File

@ -1,7 +1,7 @@
Index: madwifi-trunk-r3314/ath/if_ath.c Index: madwifi-trunk-r3314/ath/if_ath.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath/if_ath.c 2008-03-07 02:30:44.403857478 +0100 --- madwifi-trunk-r3314.orig/ath/if_ath.c
+++ madwifi-trunk-r3314/ath/if_ath.c 2008-03-07 02:30:53.276363092 +0100 +++ madwifi-trunk-r3314/ath/if_ath.c
@@ -1307,6 +1307,7 @@ @@ -1307,6 +1307,7 @@
vap->iv_key_set = ath_key_set; vap->iv_key_set = ath_key_set;
vap->iv_key_update_begin = ath_key_update_begin; vap->iv_key_update_begin = ath_key_update_begin;
@ -12,8 +12,8 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
* use those (only). */ * use those (only). */
Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.c 2008-03-07 02:30:44.275850185 +0100 --- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.c
+++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c 2008-03-07 02:30:53.276363092 +0100 +++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
@@ -622,8 +622,12 @@ @@ -622,8 +622,12 @@
return; return;
} }
@ -30,8 +30,8 @@ Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
sn->rs_thisprob [x] = 0; sn->rs_thisprob [x] = 0;
Index: madwifi-trunk-r3314/ath_rate/sample/sample.c Index: madwifi-trunk-r3314/ath_rate/sample/sample.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath_rate/sample/sample.c 2008-03-07 02:30:44.055837647 +0100 --- madwifi-trunk-r3314.orig/ath_rate/sample/sample.c
+++ madwifi-trunk-r3314/ath_rate/sample/sample.c 2008-03-07 02:30:53.280363321 +0100 +++ madwifi-trunk-r3314/ath_rate/sample/sample.c
@@ -835,7 +835,12 @@ @@ -835,7 +835,12 @@
} }
sn->static_rate_ndx = -1; sn->static_rate_ndx = -1;
@ -48,8 +48,8 @@ Index: madwifi-trunk-r3314/ath_rate/sample/sample.c
sn->rates[x].rix = sc->sc_rixmap[sn->rates[x].rate]; sn->rates[x].rix = sc->sc_rixmap[sn->rates[x].rate];
Index: madwifi-trunk-r3314/net80211/ieee80211_ioctl.h Index: madwifi-trunk-r3314/net80211/ieee80211_ioctl.h
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_ioctl.h 2008-03-07 02:30:44.211846539 +0100 --- madwifi-trunk-r3314.orig/net80211/ieee80211_ioctl.h
+++ madwifi-trunk-r3314/net80211/ieee80211_ioctl.h 2008-03-07 02:30:53.284363550 +0100 +++ madwifi-trunk-r3314/net80211/ieee80211_ioctl.h
@@ -641,6 +641,7 @@ @@ -641,6 +641,7 @@
FCC requires 30m, so that is the default. */ FCC requires 30m, so that is the default. */
IEEE80211_PARAM_BEACON_MISS_THRESH = 73, /* Beacon miss threshold (in beacons) */ IEEE80211_PARAM_BEACON_MISS_THRESH = 73, /* Beacon miss threshold (in beacons) */
@ -60,8 +60,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_ioctl.h
#define SIOCG80211STATS (SIOCDEVPRIVATE+2) #define SIOCG80211STATS (SIOCDEVPRIVATE+2)
Index: madwifi-trunk-r3314/net80211/ieee80211_var.h Index: madwifi-trunk-r3314/net80211/ieee80211_var.h
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_var.h 2008-03-07 02:30:44.155843346 +0100 --- madwifi-trunk-r3314.orig/net80211/ieee80211_var.h
+++ madwifi-trunk-r3314/net80211/ieee80211_var.h 2008-03-07 02:31:48.563513730 +0100 +++ madwifi-trunk-r3314/net80211/ieee80211_var.h
@@ -281,6 +281,7 @@ @@ -281,6 +281,7 @@
struct ieee80211_spy iv_spy; /* IWSPY support */ struct ieee80211_spy iv_spy; /* IWSPY support */
struct ieee80211_app_ie app_ie[IEEE80211_APPIE_NUM_OF_FRAME]; /* app-specified IEs by frame type */ struct ieee80211_app_ie app_ie[IEEE80211_APPIE_NUM_OF_FRAME]; /* app-specified IEs by frame type */
@ -72,8 +72,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_var.h
/* Debug functions need the defintion of struct ieee80211vap because iv_debug /* Debug functions need the defintion of struct ieee80211vap because iv_debug
Index: madwifi-trunk-r3314/net80211/ieee80211_wireless.c Index: madwifi-trunk-r3314/net80211/ieee80211_wireless.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_wireless.c 2008-03-07 02:30:44.211846539 +0100 --- madwifi-trunk-r3314.orig/net80211/ieee80211_wireless.c
+++ madwifi-trunk-r3314/net80211/ieee80211_wireless.c 2008-03-07 02:30:53.292364006 +0100 +++ madwifi-trunk-r3314/net80211/ieee80211_wireless.c
@@ -2839,6 +2839,12 @@ @@ -2839,6 +2839,12 @@
else else
ic->ic_flags_ext &= ~IEEE80211_FEXT_MARKDFS; ic->ic_flags_ext &= ~IEEE80211_FEXT_MARKDFS;

24
package/madwifi/patches/341-minrate.patch
View File

@ -1,7 +1,7 @@
Index: madwifi-trunk-r3314/ath/if_ath.c Index: madwifi-trunk-r3314/ath/if_ath.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath/if_ath.c 2008-03-07 02:30:53.276363092 +0100 --- madwifi-trunk-r3314.orig/ath/if_ath.c
+++ madwifi-trunk-r3314/ath/if_ath.c 2008-03-07 02:32:12.584882631 +0100 +++ madwifi-trunk-r3314/ath/if_ath.c
@@ -1308,6 +1308,7 @@ @@ -1308,6 +1308,7 @@
vap->iv_key_update_begin = ath_key_update_begin; vap->iv_key_update_begin = ath_key_update_begin;
vap->iv_key_update_end = ath_key_update_end; vap->iv_key_update_end = ath_key_update_end;
@ -12,8 +12,8 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
* use those (only). */ * use those (only). */
Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.c 2008-03-07 02:30:53.276363092 +0100 --- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.c
+++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c 2008-03-07 02:32:12.584882631 +0100 +++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
@@ -638,9 +638,15 @@ @@ -638,9 +638,15 @@
sn->rs_succ_hist [x] = 0; sn->rs_succ_hist [x] = 0;
sn->rs_att_hist [x] = 0; sn->rs_att_hist [x] = 0;
@ -42,8 +42,8 @@ Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
ath_fill_sample_table(sn); ath_fill_sample_table(sn);
Index: madwifi-trunk-r3314/ath_rate/sample/sample.c Index: madwifi-trunk-r3314/ath_rate/sample/sample.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath_rate/sample/sample.c 2008-03-07 02:30:53.280363321 +0100 --- madwifi-trunk-r3314.orig/ath_rate/sample/sample.c
+++ madwifi-trunk-r3314/ath_rate/sample/sample.c 2008-03-07 02:32:12.596883312 +0100 +++ madwifi-trunk-r3314/ath_rate/sample/sample.c
@@ -842,8 +842,15 @@ @@ -842,8 +842,15 @@
sn->num_rates = vap->iv_maxrateindex; sn->num_rates = vap->iv_maxrateindex;
@ -64,8 +64,8 @@ Index: madwifi-trunk-r3314/ath_rate/sample/sample.c
dev_info, __func__, x); dev_info, __func__, x);
Index: madwifi-trunk-r3314/net80211/ieee80211_ioctl.h Index: madwifi-trunk-r3314/net80211/ieee80211_ioctl.h
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_ioctl.h 2008-03-07 02:30:53.284363550 +0100 --- madwifi-trunk-r3314.orig/net80211/ieee80211_ioctl.h
+++ madwifi-trunk-r3314/net80211/ieee80211_ioctl.h 2008-03-07 02:32:12.600883541 +0100 +++ madwifi-trunk-r3314/net80211/ieee80211_ioctl.h
@@ -642,6 +642,7 @@ @@ -642,6 +642,7 @@
IEEE80211_PARAM_BEACON_MISS_THRESH = 73, /* Beacon miss threshold (in beacons) */ IEEE80211_PARAM_BEACON_MISS_THRESH = 73, /* Beacon miss threshold (in beacons) */
IEEE80211_PARAM_BEACON_MISS_THRESH_MS = 74, /* Beacon miss threshold (in ms) */ IEEE80211_PARAM_BEACON_MISS_THRESH_MS = 74, /* Beacon miss threshold (in ms) */
@ -76,8 +76,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_ioctl.h
#define SIOCG80211STATS (SIOCDEVPRIVATE+2) #define SIOCG80211STATS (SIOCDEVPRIVATE+2)
Index: madwifi-trunk-r3314/net80211/ieee80211_var.h Index: madwifi-trunk-r3314/net80211/ieee80211_var.h
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_var.h 2008-03-07 02:31:48.563513730 +0100 --- madwifi-trunk-r3314.orig/net80211/ieee80211_var.h
+++ madwifi-trunk-r3314/net80211/ieee80211_var.h 2008-03-07 02:32:12.604883771 +0100 +++ madwifi-trunk-r3314/net80211/ieee80211_var.h
@@ -282,6 +282,7 @@ @@ -282,6 +282,7 @@
struct ieee80211_app_ie app_ie[IEEE80211_APPIE_NUM_OF_FRAME]; /* app-specified IEs by frame type */ 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 */ u_int32_t app_filter; /* filters which management frames are forwarded to app */
@ -88,8 +88,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_var.h
/* Debug functions need the defintion of struct ieee80211vap because iv_debug /* Debug functions need the defintion of struct ieee80211vap because iv_debug
Index: madwifi-trunk-r3314/net80211/ieee80211_wireless.c Index: madwifi-trunk-r3314/net80211/ieee80211_wireless.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_wireless.c 2008-03-07 02:30:53.292364006 +0100 --- madwifi-trunk-r3314.orig/net80211/ieee80211_wireless.c
+++ madwifi-trunk-r3314/net80211/ieee80211_wireless.c 2008-03-07 02:32:12.604883771 +0100 +++ madwifi-trunk-r3314/net80211/ieee80211_wireless.c
@@ -2845,6 +2845,12 @@ @@ -2845,6 +2845,12 @@
else else
vap->iv_maxrateindex = 0; vap->iv_maxrateindex = 0;

12
package/madwifi/patches/342-performance.patch
View File

@ -1,7 +1,7 @@
Index: madwifi-trunk-r3314/ath/if_ath.c Index: madwifi-trunk-r3314/ath/if_ath.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath/if_ath.c 2008-06-01 02:04:25.000000000 +0200 --- madwifi-trunk-r3314.orig/ath/if_ath.c
+++ madwifi-trunk-r3314/ath/if_ath.c 2008-06-01 02:04:25.000000000 +0200 +++ madwifi-trunk-r3314/ath/if_ath.c
@@ -3237,7 +3237,6 @@ @@ -3237,7 +3237,6 @@
struct ath_softc *sc = dev->priv; struct ath_softc *sc = dev->priv;
struct ieee80211_node *ni = NULL; struct ieee80211_node *ni = NULL;
@ -48,8 +48,8 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
ATH_TXQ_LOCK_IRQ(txq); ATH_TXQ_LOCK_IRQ(txq);
Index: madwifi-trunk-r3314/net80211/ieee80211_output.c Index: madwifi-trunk-r3314/net80211/ieee80211_output.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_output.c 2008-06-01 02:04:24.000000000 +0200 --- madwifi-trunk-r3314.orig/net80211/ieee80211_output.c
+++ madwifi-trunk-r3314/net80211/ieee80211_output.c 2008-06-01 02:04:25.000000000 +0200 +++ madwifi-trunk-r3314/net80211/ieee80211_output.c
@@ -283,7 +283,7 @@ @@ -283,7 +283,7 @@
* normal vap. */ * normal vap. */
if (vap->iv_xrvap && (ni == vap->iv_bss) && if (vap->iv_xrvap && (ni == vap->iv_bss) &&
@ -218,8 +218,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_output.c
#define KEY_UNDEFINED(k) ((k).wk_cipher == &ieee80211_cipher_none) #define KEY_UNDEFINED(k) ((k).wk_cipher == &ieee80211_cipher_none)
Index: madwifi-trunk-r3314/net80211/ieee80211_input.c Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c 2008-06-01 02:04:25.000000000 +0200 --- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c
+++ madwifi-trunk-r3314/net80211/ieee80211_input.c 2008-06-01 02:04:33.000000000 +0200 +++ madwifi-trunk-r3314/net80211/ieee80211_input.c
@@ -204,7 +204,6 @@ @@ -204,7 +204,6 @@
struct ieee80211_frame *wh; struct ieee80211_frame *wh;
struct ieee80211_key *key; struct ieee80211_key *key;

10
package/madwifi/patches/343-txqueue_races.patch
View File

@ -2,9 +2,9 @@ Merged from madwifi trunk r3551, r3552
Index: madwifi-trunk-r3314/ath/if_ath.c Index: madwifi-trunk-r3314/ath/if_ath.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath/if_ath.c 2008-04-20 23:18:52.000000000 +0200 --- madwifi-trunk-r3314.orig/ath/if_ath.c
+++ madwifi-trunk-r3314/ath/if_ath.c 2008-04-20 23:20:36.000000000 +0200 +++ madwifi-trunk-r3314/ath/if_ath.c
@@ -8245,6 +8245,17 @@ @@ -8244,6 +8244,17 @@
goto bf_fail; goto bf_fail;
} }
@ -24,8 +24,8 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
Index: madwifi-trunk-r3314/ath/if_athvar.h Index: madwifi-trunk-r3314/ath/if_athvar.h
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath/if_athvar.h 2008-04-20 23:18:48.000000000 +0200 --- madwifi-trunk-r3314.orig/ath/if_athvar.h
+++ madwifi-trunk-r3314/ath/if_athvar.h 2008-04-20 23:21:12.000000000 +0200 +++ madwifi-trunk-r3314/ath/if_athvar.h
@@ -586,7 +586,8 @@ @@ -586,7 +586,8 @@
} while (0) } while (0)
#define ATH_TXQ_REMOVE_HEAD(_tq, _field) do { \ #define ATH_TXQ_REMOVE_HEAD(_tq, _field) do { \

4
package/madwifi/patches/344-minstrel_failcnt.patch
View File

@ -1,7 +1,7 @@
Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.c 2008-04-21 00:51:15.000000000 +0200 --- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.c
+++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c 2008-04-21 02:41:27.000000000 +0200 +++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
@@ -475,7 +475,7 @@ @@ -475,7 +475,7 @@
/* 'tries' is the total number of times we have endeavoured to /* 'tries' is the total number of times we have endeavoured to
* send this packet, and is a sum of the #attempts at each * send this packet, and is a sum of the #attempts at each

18
package/madwifi/patches/345-minstrel_sampling.patch
View File

@ -1,8 +1,8 @@
Index: madwifi-trunk-r3314/ath/if_ath.c Index: madwifi-trunk-r3314/ath/if_ath.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath/if_ath.c 2008-04-21 09:13:19.000000000 +0200 --- madwifi-trunk-r3314.orig/ath/if_ath.c
+++ madwifi-trunk-r3314/ath/if_ath.c 2008-04-23 01:15:49.000000000 +0200 +++ madwifi-trunk-r3314/ath/if_ath.c
@@ -8095,6 +8095,7 @@ @@ -8094,6 +8094,7 @@
ath_hal_setupxtxdesc(sc->sc_ah, ds, mrr.rate1, mrr.retries1, ath_hal_setupxtxdesc(sc->sc_ah, ds, mrr.rate1, mrr.retries1,
mrr.rate2, mrr.retries2, mrr.rate2, mrr.retries2,
mrr.rate3, mrr.retries3); mrr.rate3, mrr.retries3);
@ -12,8 +12,8 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
#ifndef ATH_SUPERG_FF #ifndef ATH_SUPERG_FF
Index: madwifi-trunk-r3314/ath/if_athvar.h Index: madwifi-trunk-r3314/ath/if_athvar.h
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath/if_athvar.h 2008-04-21 09:13:19.000000000 +0200 --- madwifi-trunk-r3314.orig/ath/if_athvar.h
+++ madwifi-trunk-r3314/ath/if_athvar.h 2008-04-23 01:15:49.000000000 +0200 +++ madwifi-trunk-r3314/ath/if_athvar.h
@@ -446,6 +446,7 @@ @@ -446,6 +446,7 @@
u_int16_t bf_flags; /* tx descriptor flags */ u_int16_t bf_flags; /* tx descriptor flags */
u_int64_t bf_tsf; u_int64_t bf_tsf;
@ -24,8 +24,8 @@ Index: madwifi-trunk-r3314/ath/if_athvar.h
* multiple segments. * multiple segments.
Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.c 2008-04-21 09:13:19.000000000 +0200 --- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.c
+++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c 2008-04-23 01:15:50.000000000 +0200 +++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
@@ -333,15 +333,19 @@ @@ -333,15 +333,19 @@
if (sn->static_rate_ndx >= 0) { if (sn->static_rate_ndx >= 0) {
ndx = sn->static_rate_ndx; ndx = sn->static_rate_ndx;
@ -76,8 +76,8 @@ Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
tries = tries - tries1; tries = tries - tries1;
Index: madwifi-trunk-r3314/net80211/ieee80211_rate.h Index: madwifi-trunk-r3314/net80211/ieee80211_rate.h
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_rate.h 2008-04-21 09:11:19.000000000 +0200 --- madwifi-trunk-r3314.orig/net80211/ieee80211_rate.h
+++ madwifi-trunk-r3314/net80211/ieee80211_rate.h 2008-04-21 09:13:19.000000000 +0200 +++ madwifi-trunk-r3314/net80211/ieee80211_rate.h
@@ -87,6 +87,7 @@ @@ -87,6 +87,7 @@
int retries2; int retries2;
int rate3; int rate3;

26
package/madwifi/patches/346-protmode_trig.patch
View File

@ -1,7 +1,7 @@
Index: madwifi-trunk-r3314/net80211/ieee80211.c Index: madwifi-trunk-r3314/net80211/ieee80211.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211.c 2008-04-23 04:33:06.000000000 +0200 --- madwifi-trunk-r3314.orig/net80211/ieee80211.c
+++ madwifi-trunk-r3314/net80211/ieee80211.c 2008-04-23 04:33:17.000000000 +0200 +++ madwifi-trunk-r3314/net80211/ieee80211.c
@@ -333,7 +333,9 @@ @@ -333,7 +333,9 @@
IEEE80211_MS_TO_TU(IEEE80211_BMISSTHRESH_DEFAULT_MS), IEEE80211_MS_TO_TU(IEEE80211_BMISSTHRESH_DEFAULT_MS),
ic->ic_lintval), ic->ic_lintval); ic->ic_lintval), ic->ic_lintval);
@ -15,9 +15,9 @@ Index: madwifi-trunk-r3314/net80211/ieee80211.c
TAILQ_INIT(&ic->ic_vaps); TAILQ_INIT(&ic->ic_vaps);
Index: madwifi-trunk-r3314/net80211/ieee80211_input.c Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c 2008-04-23 04:33:17.000000000 +0200 --- madwifi-trunk-r3314.orig/net80211/ieee80211_input.c
+++ madwifi-trunk-r3314/net80211/ieee80211_input.c 2008-04-23 05:28:00.000000000 +0200 +++ madwifi-trunk-r3314/net80211/ieee80211_input.c
@@ -3412,14 +3412,18 @@ @@ -3411,14 +3411,18 @@
IEEE80211_IS_CHAN_ANYG(ic->ic_curchan)) { IEEE80211_IS_CHAN_ANYG(ic->ic_curchan)) {
/* Assume no ERP IE == 11b AP */ /* Assume no ERP IE == 11b AP */
@ -43,8 +43,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_input.c
Index: madwifi-trunk-r3314/net80211/ieee80211_ioctl.h Index: madwifi-trunk-r3314/net80211/ieee80211_ioctl.h
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_ioctl.h 2008-04-23 04:33:17.000000000 +0200 --- madwifi-trunk-r3314.orig/net80211/ieee80211_ioctl.h
+++ madwifi-trunk-r3314/net80211/ieee80211_ioctl.h 2008-04-23 04:33:17.000000000 +0200 +++ madwifi-trunk-r3314/net80211/ieee80211_ioctl.h
@@ -643,6 +643,8 @@ @@ -643,6 +643,8 @@
IEEE80211_PARAM_BEACON_MISS_THRESH_MS = 74, /* Beacon miss threshold (in ms) */ IEEE80211_PARAM_BEACON_MISS_THRESH_MS = 74, /* Beacon miss threshold (in ms) */
IEEE80211_PARAM_MAXRATE = 75, /* Maximum rate (by table index) */ IEEE80211_PARAM_MAXRATE = 75, /* Maximum rate (by table index) */
@ -56,8 +56,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_ioctl.h
#define SIOCG80211STATS (SIOCDEVPRIVATE+2) #define SIOCG80211STATS (SIOCDEVPRIVATE+2)
Index: madwifi-trunk-r3314/net80211/ieee80211_var.h Index: madwifi-trunk-r3314/net80211/ieee80211_var.h
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_var.h 2008-04-23 04:33:17.000000000 +0200 --- madwifi-trunk-r3314.orig/net80211/ieee80211_var.h
+++ madwifi-trunk-r3314/net80211/ieee80211_var.h 2008-04-23 04:33:17.000000000 +0200 +++ madwifi-trunk-r3314/net80211/ieee80211_var.h
@@ -128,6 +128,9 @@ @@ -128,6 +128,9 @@
#define IEEE80211_APPIE_MAX 1024 #define IEEE80211_APPIE_MAX 1024
@ -80,8 +80,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_var.h
* *
Index: madwifi-trunk-r3314/net80211/ieee80211_wireless.c Index: madwifi-trunk-r3314/net80211/ieee80211_wireless.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_wireless.c 2008-04-23 04:33:17.000000000 +0200 --- madwifi-trunk-r3314.orig/net80211/ieee80211_wireless.c
+++ madwifi-trunk-r3314/net80211/ieee80211_wireless.c 2008-04-23 04:33:17.000000000 +0200 +++ madwifi-trunk-r3314/net80211/ieee80211_wireless.c
@@ -2312,6 +2312,12 @@ @@ -2312,6 +2312,12 @@
IEEE80211_IS_CHAN_ANYG(ic->ic_bsschan)) IEEE80211_IS_CHAN_ANYG(ic->ic_bsschan))
retv = ENETRESET; retv = ENETRESET;
@ -125,8 +125,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_wireless.c
{ IEEE80211_PARAM_MCASTCIPHER, { IEEE80211_PARAM_MCASTCIPHER,
Index: madwifi-trunk-r3314/net80211/ieee80211_node.c Index: madwifi-trunk-r3314/net80211/ieee80211_node.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_node.c 2008-04-23 04:33:16.000000000 +0200 --- madwifi-trunk-r3314.orig/net80211/ieee80211_node.c
+++ madwifi-trunk-r3314/net80211/ieee80211_node.c 2008-04-23 05:28:47.000000000 +0200 +++ madwifi-trunk-r3314/net80211/ieee80211_node.c
@@ -1877,6 +1877,17 @@ @@ -1877,6 +1877,17 @@
ieee80211_scan_timeout(ic); ieee80211_scan_timeout(ic);

26
package/madwifi/patches/347-tuning.patch
View File

@ -1,8 +1,8 @@
Index: madwifi-trunk-r3314/ath/if_ath.c Index: madwifi-trunk-r3314/ath/if_ath.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath/if_ath.c 2008-04-23 03:31:06.000000000 +0200 --- madwifi-trunk-r3314.orig/ath/if_ath.c
+++ madwifi-trunk-r3314/ath/if_ath.c 2008-04-23 03:31:23.000000000 +0200 +++ madwifi-trunk-r3314/ath/if_ath.c
@@ -10267,11 +10267,11 @@ @@ -10265,11 +10265,11 @@
sc->sc_currates = rt; sc->sc_currates = rt;
sc->sc_curmode = mode; sc->sc_curmode = mode;
/* /*
@ -19,8 +19,8 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
} }
Index: madwifi-trunk-r3314/ath/if_athvar.h Index: madwifi-trunk-r3314/ath/if_athvar.h
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath/if_athvar.h 2008-04-23 03:31:23.000000000 +0200 --- madwifi-trunk-r3314.orig/ath/if_athvar.h
+++ madwifi-trunk-r3314/ath/if_athvar.h 2008-04-23 03:31:23.000000000 +0200 +++ madwifi-trunk-r3314/ath/if_athvar.h
@@ -272,6 +272,10 @@ @@ -272,6 +272,10 @@
#define AES_ICV_FIELD_SIZE 8 /* AES ICV field size */ #define AES_ICV_FIELD_SIZE 8 /* AES ICV field size */
#define EXT_IV_FIELD_SIZE 4 /* ext IV field size */ #define EXT_IV_FIELD_SIZE 4 /* ext IV field size */
@ -34,8 +34,8 @@ Index: madwifi-trunk-r3314/ath/if_athvar.h
#define XR_DEFAULT_GRPPOLL_RATE_STR "0.25 1 1 3 3 6 6 20" #define XR_DEFAULT_GRPPOLL_RATE_STR "0.25 1 1 3 3 6 6 20"
Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.c 2008-04-23 03:31:01.000000000 +0200 --- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.c
+++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c 2008-04-23 03:31:23.000000000 +0200 +++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
@@ -197,7 +197,7 @@ @@ -197,7 +197,7 @@
unsigned int x = 0, tt = 0; unsigned int x = 0, tt = 0;
unsigned int cix = rt->info[rix].controlRate; unsigned int cix = rt->info[rix].controlRate;
@ -56,8 +56,8 @@ Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.c
return tt; return tt;
Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.h Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.h
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.h 2008-04-23 03:31:01.000000000 +0200 --- madwifi-trunk-r3314.orig/ath_rate/minstrel/minstrel.h
+++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.h 2008-04-23 03:31:23.000000000 +0200 +++ madwifi-trunk-r3314/ath_rate/minstrel/minstrel.h
@@ -180,14 +180,6 @@ @@ -180,14 +180,6 @@
#define MAX(a,b) ((a) > (b) ? (a) : (b)) #define MAX(a,b) ((a) > (b) ? (a) : (b))
#endif #endif
@ -75,8 +75,8 @@ Index: madwifi-trunk-r3314/ath_rate/minstrel/minstrel.h
* a 5212 h/w descriptor. These Don't belong here; the * a 5212 h/w descriptor. These Don't belong here; the
Index: madwifi-trunk-r3314/ath_rate/sample/sample.c Index: madwifi-trunk-r3314/ath_rate/sample/sample.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath_rate/sample/sample.c 2008-04-23 03:31:01.000000000 +0200 --- madwifi-trunk-r3314.orig/ath_rate/sample/sample.c
+++ madwifi-trunk-r3314/ath_rate/sample/sample.c 2008-04-23 03:31:23.000000000 +0200 +++ madwifi-trunk-r3314/ath_rate/sample/sample.c
@@ -170,7 +170,7 @@ @@ -170,7 +170,7 @@
struct ieee80211com *ic = &sc->sc_ic; struct ieee80211com *ic = &sc->sc_ic;
unsigned int tt = 0; unsigned int tt = 0;
@ -97,8 +97,8 @@ Index: madwifi-trunk-r3314/ath_rate/sample/sample.c
return tt; return tt;
Index: madwifi-trunk-r3314/ath_rate/sample/sample.h Index: madwifi-trunk-r3314/ath_rate/sample/sample.h
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath_rate/sample/sample.h 2008-04-23 03:31:01.000000000 +0200 --- madwifi-trunk-r3314.orig/ath_rate/sample/sample.h
+++ madwifi-trunk-r3314/ath_rate/sample/sample.h 2008-04-23 03:31:23.000000000 +0200 +++ madwifi-trunk-r3314/ath_rate/sample/sample.h
@@ -106,9 +106,6 @@ @@ -106,9 +106,6 @@
#define MAX(a,b) ((a) > (b) ? (a) : (b)) #define MAX(a,b) ((a) > (b) ? (a) : (b))
#endif #endif

10
package/madwifi/patches/348-ackcts.patch
View File

@ -1,7 +1,7 @@
Index: madwifi-trunk-r3314/ath/if_ath.c Index: madwifi-trunk-r3314/ath/if_ath.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath/if_ath.c 2008-04-23 06:50:24.000000000 +0200 --- madwifi-trunk-r3314.orig/ath/if_ath.c
+++ madwifi-trunk-r3314/ath/if_ath.c 2008-04-23 06:54:03.000000000 +0200 +++ madwifi-trunk-r3314/ath/if_ath.c
@@ -2721,6 +2721,9 @@ @@ -2721,6 +2721,9 @@
static int static int
ath_set_ack_bitrate(struct ath_softc *sc, int high) ath_set_ack_bitrate(struct ath_softc *sc, int high)
@ -12,7 +12,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
if (ar_device(sc->devid) == 5212 || ar_device(sc->devid) == 5213) { if (ar_device(sc->devid) == 5212 || ar_device(sc->devid) == 5213) {
/* set ack to be sent at low bit-rate */ /* set ack to be sent at low bit-rate */
/* registers taken from the OpenBSD 5212 HAL */ /* registers taken from the OpenBSD 5212 HAL */
@@ -10782,8 +10785,13 @@ @@ -10780,8 +10783,13 @@
break; break;
#endif #endif
case ATH_ACKRATE: case ATH_ACKRATE:
@ -30,8 +30,8 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
ath_rp_record(sc, ath_rp_record(sc,
Index: madwifi-trunk-r3314/ath/if_athvar.h Index: madwifi-trunk-r3314/ath/if_athvar.h
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath/if_athvar.h 2008-04-23 05:41:40.000000000 +0200 --- madwifi-trunk-r3314.orig/ath/if_athvar.h
+++ madwifi-trunk-r3314/ath/if_athvar.h 2008-04-23 06:53:03.000000000 +0200 +++ madwifi-trunk-r3314/ath/if_athvar.h
@@ -681,6 +681,7 @@ @@ -681,6 +681,7 @@
unsigned int sc_devstopped:1; /* stopped due to of no tx bufs */ unsigned int sc_devstopped:1; /* stopped due to of no tx bufs */
unsigned int sc_stagbeacons:1; /* use staggered beacons */ unsigned int sc_stagbeacons:1; /* use staggered beacons */

6
package/madwifi/patches/349-reset.patch
View File

@ -1,7 +1,7 @@
Index: madwifi-trunk-r3314/ath/if_ath.c Index: madwifi-trunk-r3314/ath/if_ath.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath/if_ath.c 2008-04-09 02:58:41.000000000 +0200 --- madwifi-trunk-r3314.orig/ath/if_ath.c
+++ madwifi-trunk-r3314/ath/if_ath.c 2008-04-09 02:59:40.000000000 +0200 +++ madwifi-trunk-r3314/ath/if_ath.c
@@ -2479,7 +2479,7 @@ @@ -2479,7 +2479,7 @@
*/ */
sc->sc_curchan.channel = ic->ic_curchan->ic_freq; sc->sc_curchan.channel = ic->ic_curchan->ic_freq;
@ -11,7 +11,7 @@ Index: madwifi-trunk-r3314/ath/if_ath.c
EPRINTF(sc, "unable to reset hardware: '%s' (HAL status %u) " EPRINTF(sc, "unable to reset hardware: '%s' (HAL status %u) "
"(freq %u flags 0x%x)\n", "(freq %u flags 0x%x)\n",
ath_get_hal_status_desc(status), status, ath_get_hal_status_desc(status), status,
@@ -8865,8 +8865,7 @@ @@ -8853,8 +8853,7 @@
* needed to do the reset with chanchange = AH_FALSE in order * needed to do the reset with chanchange = AH_FALSE in order
* to receive traffic when peforming high velocity channel * to receive traffic when peforming high velocity channel
* changes. */ * changes. */

4
package/madwifi/patches/350-wisoc_softled.patch
View File

@ -1,7 +1,7 @@
Index: madwifi-trunk-r3314/ath/if_ath_ahb.c Index: madwifi-trunk-r3314/ath/if_ath_ahb.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/ath/if_ath_ahb.c 2008-03-07 11:40:44.967178082 +0100 --- madwifi-trunk-r3314.orig/ath/if_ath_ahb.c
+++ madwifi-trunk-r3314/ath/if_ath_ahb.c 2008-03-07 11:40:47.763337418 +0100 +++ madwifi-trunk-r3314/ath/if_ath_ahb.c
@@ -245,6 +245,8 @@ @@ -245,6 +245,8 @@
num_activesc++; num_activesc++;
/* Ready to process interrupts */ /* Ready to process interrupts */

32
package/madwifi/patches/351-scanlist.patch
View File

@ -1,7 +1,7 @@
Index: madwifi-trunk-r3314/net80211/ieee80211_scan_sta.c Index: madwifi-trunk-r3314/net80211/ieee80211_scan_sta.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_scan_sta.c 2008-06-01 03:41:58.000000000 +0200 --- madwifi-trunk-r3314.orig/net80211/ieee80211_scan_sta.c
+++ madwifi-trunk-r3314/net80211/ieee80211_scan_sta.c 2008-06-01 03:42:18.000000000 +0200 +++ madwifi-trunk-r3314/net80211/ieee80211_scan_sta.c
@@ -317,147 +317,6 @@ @@ -317,147 +317,6 @@
#undef ISPROBE #undef ISPROBE
} }
@ -343,8 +343,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_scan_sta.c
.scan_end = adhoc_pick_bss, .scan_end = adhoc_pick_bss,
Index: madwifi-trunk-r3314/net80211/ieee80211.c Index: madwifi-trunk-r3314/net80211/ieee80211.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211.c 2008-06-01 03:41:58.000000000 +0200 --- madwifi-trunk-r3314.orig/net80211/ieee80211.c
+++ madwifi-trunk-r3314/net80211/ieee80211.c 2008-06-01 03:42:18.000000000 +0200 +++ madwifi-trunk-r3314/net80211/ieee80211.c
@@ -278,6 +278,11 @@ @@ -278,6 +278,11 @@
("channel with bogus ieee number %u", c->ic_ieee)); ("channel with bogus ieee number %u", c->ic_ieee));
setbit(ic->ic_chan_avail, c->ic_ieee); setbit(ic->ic_chan_avail, c->ic_ieee);
@ -359,8 +359,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211.c
ic->ic_modecaps |= 1 << IEEE80211_MODE_11A; ic->ic_modecaps |= 1 << IEEE80211_MODE_11A;
Index: madwifi-trunk-r3314/net80211/_ieee80211.h Index: madwifi-trunk-r3314/net80211/_ieee80211.h
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/_ieee80211.h 2008-06-01 03:41:58.000000000 +0200 --- madwifi-trunk-r3314.orig/net80211/_ieee80211.h
+++ madwifi-trunk-r3314/net80211/_ieee80211.h 2008-06-01 03:42:18.000000000 +0200 +++ madwifi-trunk-r3314/net80211/_ieee80211.h
@@ -132,6 +132,11 @@ @@ -132,6 +132,11 @@
IEEE80211_SCAN_FIRST = 2, /* take first suitable candidate */ IEEE80211_SCAN_FIRST = 2, /* take first suitable candidate */
}; };
@ -383,8 +383,8 @@ Index: madwifi-trunk-r3314/net80211/_ieee80211.h
#define IEEE80211_CHAN_MAX 255 #define IEEE80211_CHAN_MAX 255
Index: madwifi-trunk-r3314/net80211/ieee80211_ioctl.h Index: madwifi-trunk-r3314/net80211/ieee80211_ioctl.h
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_ioctl.h 2008-06-01 03:41:58.000000000 +0200 --- madwifi-trunk-r3314.orig/net80211/ieee80211_ioctl.h
+++ madwifi-trunk-r3314/net80211/ieee80211_ioctl.h 2008-06-01 03:42:18.000000000 +0200 +++ madwifi-trunk-r3314/net80211/ieee80211_ioctl.h
@@ -555,6 +555,7 @@ @@ -555,6 +555,7 @@
#define IEEE80211_IOCTL_WDSADDMAC (SIOCIWFIRSTPRIV+26) #define IEEE80211_IOCTL_WDSADDMAC (SIOCIWFIRSTPRIV+26)
#define IEEE80211_IOCTL_WDSDELMAC (SIOCIWFIRSTPRIV+28) #define IEEE80211_IOCTL_WDSDELMAC (SIOCIWFIRSTPRIV+28)
@ -395,8 +395,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_ioctl.h
IEEE80211_WMMPARAMS_CWMIN = 1, IEEE80211_WMMPARAMS_CWMIN = 1,
Index: madwifi-trunk-r3314/net80211/ieee80211_scan_ap.c Index: madwifi-trunk-r3314/net80211/ieee80211_scan_ap.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_scan_ap.c 2008-06-01 03:41:58.000000000 +0200 --- madwifi-trunk-r3314.orig/net80211/ieee80211_scan_ap.c
+++ madwifi-trunk-r3314/net80211/ieee80211_scan_ap.c 2008-06-01 03:42:18.000000000 +0200 +++ madwifi-trunk-r3314/net80211/ieee80211_scan_ap.c
@@ -129,131 +129,7 @@ @@ -129,131 +129,7 @@
static int ap_flush(struct ieee80211_scan_state *); static int ap_flush(struct ieee80211_scan_state *);
@ -666,8 +666,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_scan_ap.c
as->as_required_mode) as->as_required_mode)
Index: madwifi-trunk-r3314/net80211/ieee80211_scan.c Index: madwifi-trunk-r3314/net80211/ieee80211_scan.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_scan.c 2008-06-01 03:41:58.000000000 +0200 --- madwifi-trunk-r3314.orig/net80211/ieee80211_scan.c
+++ madwifi-trunk-r3314/net80211/ieee80211_scan.c 2008-06-01 03:42:18.000000000 +0200 +++ madwifi-trunk-r3314/net80211/ieee80211_scan.c
@@ -958,6 +958,79 @@ @@ -958,6 +958,79 @@
} }
} }
@ -750,8 +750,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_scan.c
* signal is detected. AP mode only. Return 1 on success, 0 on * signal is detected. AP mode only. Return 1 on success, 0 on
Index: madwifi-trunk-r3314/net80211/ieee80211_scan.h Index: madwifi-trunk-r3314/net80211/ieee80211_scan.h
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_scan.h 2008-06-01 03:41:58.000000000 +0200 --- madwifi-trunk-r3314.orig/net80211/ieee80211_scan.h
+++ madwifi-trunk-r3314/net80211/ieee80211_scan.h 2008-06-01 03:42:18.000000000 +0200 +++ madwifi-trunk-r3314/net80211/ieee80211_scan.h
@@ -219,4 +219,7 @@ @@ -219,4 +219,7 @@
void ieee80211_scanner_unregister(enum ieee80211_opmode, void ieee80211_scanner_unregister(enum ieee80211_opmode,
const struct ieee80211_scanner *); const struct ieee80211_scanner *);
@ -762,8 +762,8 @@ Index: madwifi-trunk-r3314/net80211/ieee80211_scan.h
#endif /* _NET80211_IEEE80211_SCAN_H_ */ #endif /* _NET80211_IEEE80211_SCAN_H_ */
Index: madwifi-trunk-r3314/net80211/ieee80211_wireless.c Index: madwifi-trunk-r3314/net80211/ieee80211_wireless.c
=================================================================== ===================================================================
--- madwifi-trunk-r3314.orig/net80211/ieee80211_wireless.c 2008-06-01 03:41:58.000000000 +0200 --- madwifi-trunk-r3314.orig/net80211/ieee80211_wireless.c
+++ madwifi-trunk-r3314/net80211/ieee80211_wireless.c 2008-06-01 03:42:53.000000000 +0200 +++ madwifi-trunk-r3314/net80211/ieee80211_wireless.c
@@ -3873,6 +3873,106 @@ @@ -3873,6 +3873,106 @@
return ieee80211_ioctl_setmlme(dev, info, w, (char *)&mlme); return ieee80211_ioctl_setmlme(dev, info, w, (char *)&mlme);
} }