upgrade madwifi, finally fix the annoying ap auto channel selection bug, default...

[openwrt/openwrt.git] / 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 59bf7f728d126e545eeb95b4a2bfa09a990cdca9..45e15932a3721031bb0b5728e80d6953d009616e 100644 (file)
--- 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
 @@ -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 *))
  #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 )
 @@ -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;
  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
  }
  
  #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.
   */
  /*
   * 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 <linux/netdevice.h>
  #include <linux/init.h>
  #include <linux/delay.h>
  #include <linux/netdevice.h>
  #include <linux/init.h>
  #include <linux/delay.h>

--#include <linux/sort.h>
--
- #include "if_media.h"
- 
- #include <net80211/ieee80211_var.h>
- 
++

 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11)
 +#include "sort.c"
 +#else
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11)
 +#include "sort.c"
 +#else

-+#include <linux/sort.h>
+ #include <linux/sort.h>

 +#endif
 +#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
 ===================================================================
 --- /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
 @@ -0,0 +1,120 @@
 +/*
 + * A fast, small, non-recursive O(nlog n) sort for the Linux kernel