X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/8bccd2e819bc4c013d3fb83841460217d7f76989..f251f740878af188b1f27d19ec921efa6c577349:/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..88601a4c7 100644
--- a/package/madwifi/patches/124-linux24_compat.patch
+++ b/package/madwifi/patches/124-linux24_compat.patch
@@ -1,9 +1,7 @@
-Index: madwifi-dfs-r3053/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
-@@ -128,6 +128,11 @@
- #define	NETDEV_TX_BUSY	1
+--- a/ath/if_athvar.h
++++ b/ath/if_athvar.h
+@@ -126,6 +126,11 @@ typedef void irqreturn_t;
+ #define ATH_GET_NETDEV_DEV(ndev)	((ndev)->class_dev.dev)
  #endif
  
 +#ifndef NETDEV_TX_OK
@@ -14,10 +12,8 @@ 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
-===================================================================
---- 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
+--- a/ath/if_ath_radar.c
++++ b/ath/if_ath_radar.c
 @@ -92,6 +92,13 @@
  #define nofloat_pct(_value, _pct) \
  	( (_value * (1000 + _pct)) / 1000 )
@@ -32,11 +28,9 @@ 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
-===================================================================
---- 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 @@
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
+@@ -4705,6 +4705,46 @@ ath_beacon_setup(struct ath_softc *sc, s
  #undef USE_SHPREAMBLE
  }
  
@@ -83,33 +77,8 @@ 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
-===================================================================
---- madwifi-dfs-r3053.orig/net80211/ieee80211_scan_ap.c	2007-12-13 05:25:10.554226918 +0100
-+++ madwifi-dfs-r3053/net80211/ieee80211_scan_ap.c	2007-12-13 05:25:12.858358223 +0100
-@@ -46,12 +46,16 @@
- #include <linux/netdevice.h>
- #include <linux/init.h>
- #include <linux/delay.h>
--#include <linux/sort.h>
--
- #include "if_media.h"
- 
- #include <net80211/ieee80211_var.h>
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11)
-+#include "sort.c"
-+#else
-+#include <linux/sort.h>
-+#endif
-+
- #define	AP_PURGE_SCANS	2		/* age for purging entries (scans) */
- #define RSSI_LPF_LEN	10
- #define	RSSI_EP_MULTIPLIER	(1<<7)	/* pow2 to optimize out * and / */
-Index: madwifi-dfs-r3053/net80211/sort.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ madwifi-dfs-r3053/net80211/sort.c	2007-12-13 05:25:12.862358452 +0100
+--- /dev/null
++++ b/net80211/sort.c
 @@ -0,0 +1,120 @@
 +/*
 + * A fast, small, non-recursive O(nlog n) sort for the Linux kernel