From 410d80b0c87de11d3f70b012b8168b8b00a76f3a Mon Sep 17 00:00:00 2001 From: nbd Date: Fri, 25 Jan 2008 20:24:25 +0000 Subject: upgrade madwifi, finally fix the annoying ap auto channel selection bug, default to automatic channel selection git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10259 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/madwifi/patches/124-linux24_compat.patch | 48 +++++++++++------------- 1 file changed, 21 insertions(+), 27 deletions(-) (limited to 'package/madwifi/patches/124-linux24_compat.patch') diff --git a/package/madwifi/patches/124-linux24_compat.patch b/package/madwifi/patches/124-linux24_compat.patch index 59bf7f728..45e15932a 100644 --- a/package/madwifi/patches/124-linux24_compat.patch +++ b/package/madwifi/patches/124-linux24_compat.patch @@ -1,7 +1,7 @@ -Index: madwifi-dfs-r3053/ath/if_athvar.h +Index: madwifi-dfs-r3252/ath/if_athvar.h =================================================================== ---- madwifi-dfs-r3053.orig/ath/if_athvar.h 2007-12-13 05:25:10.534225778 +0100 -+++ madwifi-dfs-r3053/ath/if_athvar.h 2007-12-13 05:25:12.842357313 +0100 +--- madwifi-dfs-r3252.orig/ath/if_athvar.h 2008-01-25 21:13:50.832747032 +0100 ++++ madwifi-dfs-r3252/ath/if_athvar.h 2008-01-25 21:14:09.785827106 +0100 @@ -128,6 +128,11 @@ #define NETDEV_TX_BUSY 1 #endif @@ -14,10 +14,10 @@ Index: madwifi-dfs-r3053/ath/if_athvar.h #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,23) static inline struct net_device *_alloc_netdev(int sizeof_priv, const char *mask, void (*setup)(struct net_device *)) -Index: madwifi-dfs-r3053/ath/if_ath_radar.c +Index: madwifi-dfs-r3252/ath/if_ath_radar.c =================================================================== ---- madwifi-dfs-r3053.orig/ath/if_ath_radar.c 2007-12-13 05:25:10.538226007 +0100 -+++ madwifi-dfs-r3053/ath/if_ath_radar.c 2007-12-13 05:25:12.850357768 +0100 +--- madwifi-dfs-r3252.orig/ath/if_ath_radar.c 2008-01-25 21:13:50.840747487 +0100 ++++ madwifi-dfs-r3252/ath/if_ath_radar.c 2008-01-25 21:14:09.789827335 +0100 @@ -92,6 +92,13 @@ #define nofloat_pct(_value, _pct) \ ( (_value * (1000 + _pct)) / 1000 ) @@ -32,11 +32,11 @@ Index: madwifi-dfs-r3053/ath/if_ath_radar.c struct radar_pattern_specification { /* The name of the rule/specification (i.e. what did we detect) */ const char *name; -Index: madwifi-dfs-r3053/ath/if_ath.c +Index: madwifi-dfs-r3252/ath/if_ath.c =================================================================== ---- madwifi-dfs-r3053.orig/ath/if_ath.c 2007-12-13 05:25:11.582285503 +0100 -+++ madwifi-dfs-r3053/ath/if_ath.c 2007-12-13 05:25:12.854357994 +0100 -@@ -4595,6 +4595,46 @@ +--- madwifi-dfs-r3252.orig/ath/if_ath.c 2008-01-25 21:13:59.245226430 +0100 ++++ madwifi-dfs-r3252/ath/if_ath.c 2008-01-25 21:14:09.797827791 +0100 +@@ -4698,6 +4698,46 @@ #undef USE_SHPREAMBLE } @@ -83,33 +83,27 @@ Index: madwifi-dfs-r3053/ath/if_ath.c /* * Generate beacon frame and queue cab data for a VAP. */ -Index: madwifi-dfs-r3053/net80211/ieee80211_scan_ap.c +Index: madwifi-dfs-r3252/net80211/ieee80211_scan_ap.c =================================================================== ---- madwifi-dfs-r3053.orig/net80211/ieee80211_scan_ap.c 2007-12-13 05:25:10.554226918 +0100 -+++ madwifi-dfs-r3053/net80211/ieee80211_scan_ap.c 2007-12-13 05:25:12.858358223 +0100 -@@ -46,12 +46,16 @@ +--- madwifi-dfs-r3252.orig/net80211/ieee80211_scan_ap.c 2008-01-25 21:13:50.852748172 +0100 ++++ madwifi-dfs-r3252/net80211/ieee80211_scan_ap.c 2008-01-25 21:14:33.343169561 +0100 +@@ -46,7 +46,12 @@ #include #include #include --#include -- - #include "if_media.h" - - #include - ++ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11) +#include "sort.c" +#else -+#include + #include +#endif -+ - #define AP_PURGE_SCANS 2 /* age for purging entries (scans) */ - #define RSSI_LPF_LEN 10 - #define RSSI_EP_MULTIPLIER (1<<7) /* pow2 to optimize out * and / */ -Index: madwifi-dfs-r3053/net80211/sort.c + + #include "if_media.h" + +Index: madwifi-dfs-r3252/net80211/sort.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ madwifi-dfs-r3053/net80211/sort.c 2007-12-13 05:25:12.862358452 +0100 ++++ madwifi-dfs-r3252/net80211/sort.c 2008-01-25 21:14:09.801828016 +0100 @@ -0,0 +1,120 @@ +/* + * A fast, small, non-recursive O(nlog n) sort for the Linux kernel -- cgit v1.2.3