madwifi: recompile and update for new kernel

ref #574
ref #647

4 files changed, 10 insertions, 466 deletions

diff --git a/abs/core/madwifi/PKGBUILD b/abs/core/madwifi/PKGBUILD
index a6cb369..d9e4beb 100644
--- a/abs/core/madwifi/PKGBUILD
+++ b/abs/core/madwifi/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 80421 2010-05-17 08:11:17Z tpowa $
+# $Id: PKGBUILD 97001 2010-10-25 21:03:02Z tpowa $
 # Originally by kleptophobiac <kleptophobiac@gmail.com>
 # Modified by James Rayner for the repositories <iphitus@gmail.com>
 
-_kernver=2.6.34-LinHES
+_kernver=2.6.36-LinHES
 
 pkgname=madwifi
-pkgver=0.9.4.4119
-pkgrel=2
+pkgver=0.9.4.4133
+pkgrel=3
 pkgdesc="Madwifi drivers for Atheros wireless chipsets. For stock arch 2.6 kernel"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://madwifi-project.org"
-depends=('madwifi-utils' 'kernel26>=2.6.34' 'kernel26<2.6.35')
-makedepends=('kernel26-headers>=2.6.34' 'kernel26-headers<2.6.35')
+depends=('madwifi-utils' 'kernel26>=2.6.36' 'kernel26<2.6.37')
+makedepends=('kernel26-headers>=2.6.36' 'kernel26-headers<2.6.37')
 makedepends=('sharutils')
 install=madwifi-ng.install
 # subversion source: svn checkout http:/madwifi-project.org/svn/madwifi/trunk madwifi
@@ -37,4 +37,4 @@ build() {
   rm -r $startdir/pkg/lib/modules/$_kernver/net/
 }
 
-md5sums=('a720a20264b312c0ff906b9888bb49ae')
+md5sums=('ca3c3504d000e7b3d7063af46271c932')
diff --git a/abs/core/madwifi/kernel-2.6.19.patch b/abs/core/madwifi/kernel-2.6.19.patch
deleted file mode 100644
index ddef01a..0000000
--- a/abs/core/madwifi/kernel-2.6.19.patch
+++ /dev/null
@@ -1,383 +0,0 @@
-diff -ur madwifi-0.9.2/ath/if_ath.c madwifi-0.9.2-neu/ath/if_ath.c
---- madwifi-0.9.2/ath/if_ath.c	2006-07-08 08:47:19.000000000 +0200
-+++ madwifi-0.9.2-neu/ath/if_ath.c	2006-11-11 11:50:02.000000000 +0100
-@@ -44,7 +44,7 @@
-  */
- #include "opt_ah.h"
- 
--#include <linux/config.h>
-+
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/init.h>
-diff -ur madwifi-0.9.2/ath/if_ath_ahb.c madwifi-0.9.2-neu/ath/if_ath_ahb.c
---- madwifi-0.9.2/ath/if_ath_ahb.c	2006-05-22 06:39:55.000000000 +0200
-+++ madwifi-0.9.2-neu/ath/if_ath_ahb.c	2006-11-11 11:50:02.000000000 +0100
-@@ -10,7 +10,7 @@
- #define	EXPORT_SYMTAB
- #endif
- 
--#include <linux/config.h>
-+
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/init.h>
-diff -ur madwifi-0.9.2/ath/if_ath_pci.c madwifi-0.9.2-neu/ath/if_ath_pci.c
---- madwifi-0.9.2/ath/if_ath_pci.c	2006-07-21 10:00:32.000000000 +0200
-+++ madwifi-0.9.2-neu/ath/if_ath_pci.c	2006-11-11 11:50:02.000000000 +0100
-@@ -42,7 +42,7 @@
- #define	EXPORT_SYMTAB
- #endif
- 
--#include <linux/config.h>
-+
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/init.h>
-diff -ur madwifi-0.9.2/ath_rate/amrr/amrr.c madwifi-0.9.2-neu/ath_rate/amrr/amrr.c
---- madwifi-0.9.2/ath_rate/amrr/amrr.c	2006-07-04 12:23:35.000000000 +0200
-+++ madwifi-0.9.2-neu/ath_rate/amrr/amrr.c	2006-11-11 11:50:03.000000000 +0100
-@@ -43,7 +43,7 @@
-  * "IEEE 802.11 Rate Adaptation: A Practical Approach" by
-  *    Mathieu Lacage, Hossein Manshaei, Thierry Turletti
-  */
--#include <linux/config.h>
-+
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/init.h>
-diff -ur madwifi-0.9.2/ath_rate/onoe/onoe.c madwifi-0.9.2-neu/ath_rate/onoe/onoe.c
---- madwifi-0.9.2/ath_rate/onoe/onoe.c	2006-07-04 12:23:35.000000000 +0200
-+++ madwifi-0.9.2-neu/ath_rate/onoe/onoe.c	2006-11-11 11:50:03.000000000 +0100
-@@ -39,7 +39,7 @@
- /*
-  * Atsushi Onoe's rate control algorithm.
-  */
--#include <linux/config.h>
-+
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/init.h>
-diff -ur madwifi-0.9.2/ath_rate/sample/sample.c madwifi-0.9.2-neu/ath_rate/sample/sample.c
---- madwifi-0.9.2/ath_rate/sample/sample.c	2006-07-04 12:23:35.000000000 +0200
-+++ madwifi-0.9.2-neu/ath_rate/sample/sample.c	2006-11-11 11:50:03.000000000 +0100
-@@ -41,7 +41,7 @@
-  * John Bicket's SampleRate control algorithm.
-  */
- 
--#include <linux/config.h>
-+
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/init.h>
-diff -ur madwifi-0.9.2/hal/linux/ah_osdep.c madwifi-0.9.2-neu/hal/linux/ah_osdep.c
---- madwifi-0.9.2/hal/linux/ah_osdep.c	2006-05-19 12:25:45.000000000 +0200
-+++ madwifi-0.9.2-neu/hal/linux/ah_osdep.c	2006-11-11 11:50:02.000000000 +0100
-@@ -41,7 +41,7 @@
- #define	EXPORT_SYMTAB
- #endif
- 
--#include <linux/config.h>
-+
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/init.h>
-diff -ur madwifi-0.9.2/net80211/ieee80211.c madwifi-0.9.2-neu/net80211/ieee80211.c
---- madwifi-0.9.2/net80211/ieee80211.c	2006-07-04 12:22:11.000000000 +0200
-+++ madwifi-0.9.2-neu/net80211/ieee80211.c	2006-11-11 11:50:03.000000000 +0100
-@@ -38,7 +38,7 @@
- /*
-  * IEEE 802.11 generic handler
-  */
--#include <linux/config.h>
-+
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/skbuff.h>
-diff -ur madwifi-0.9.2/net80211/ieee80211_acl.c madwifi-0.9.2-neu/net80211/ieee80211_acl.c
---- madwifi-0.9.2/net80211/ieee80211_acl.c	2006-05-31 23:05:08.000000000 +0200
-+++ madwifi-0.9.2-neu/net80211/ieee80211_acl.c	2006-11-11 11:50:03.000000000 +0100
-@@ -45,7 +45,7 @@
-  * and if found the frame is either accepted (ACL_POLICY_ALLOW)
-  * or rejected (ACL_POLICY_DENT).
-  */
--#include <linux/config.h>
-+
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/skbuff.h>
-diff -ur madwifi-0.9.2/net80211/ieee80211_beacon.c madwifi-0.9.2-neu/net80211/ieee80211_beacon.c
---- madwifi-0.9.2/net80211/ieee80211_beacon.c	2006-05-19 22:42:19.000000000 +0200
-+++ madwifi-0.9.2-neu/net80211/ieee80211_beacon.c	2006-11-11 11:50:03.000000000 +0100
-@@ -38,7 +38,7 @@
- /*
-  * IEEE 802.11 beacon handling routines
-  */
--#include <linux/config.h>
-+
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/skbuff.h>
-diff -ur madwifi-0.9.2/net80211/ieee80211_crypto.c madwifi-0.9.2-neu/net80211/ieee80211_crypto.c
---- madwifi-0.9.2/net80211/ieee80211_crypto.c	2006-02-01 21:07:11.000000000 +0100
-+++ madwifi-0.9.2-neu/net80211/ieee80211_crypto.c	2006-11-11 11:50:03.000000000 +0100
-@@ -38,7 +38,7 @@
- /*
-  * IEEE 802.11 generic crypto support.
-  */
--#include <linux/config.h>
-+
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/kmod.h>
-diff -ur madwifi-0.9.2/net80211/ieee80211_crypto_ccmp.c madwifi-0.9.2-neu/net80211/ieee80211_crypto_ccmp.c
---- madwifi-0.9.2/net80211/ieee80211_crypto_ccmp.c	2006-06-13 16:09:51.000000000 +0200
-+++ madwifi-0.9.2-neu/net80211/ieee80211_crypto_ccmp.c	2006-11-11 11:50:03.000000000 +0100
-@@ -38,7 +38,7 @@
-  * AP driver. The code is used with the consent of the author and
-  * it's license is included below.
-  */
--#include <linux/config.h>
-+
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/skbuff.h>
-diff -ur madwifi-0.9.2/net80211/ieee80211_crypto_none.c madwifi-0.9.2-neu/net80211/ieee80211_crypto_none.c
---- madwifi-0.9.2/net80211/ieee80211_crypto_none.c	2006-02-01 21:07:11.000000000 +0100
-+++ madwifi-0.9.2-neu/net80211/ieee80211_crypto_none.c	2006-11-11 11:50:03.000000000 +0100
-@@ -34,7 +34,7 @@
- /*
-  * IEEE 802.11 NULL crypto support.
-  */
--#include <linux/config.h>
-+
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/skbuff.h>
-diff -ur madwifi-0.9.2/net80211/ieee80211_crypto_tkip.c madwifi-0.9.2-neu/net80211/ieee80211_crypto_tkip.c
---- madwifi-0.9.2/net80211/ieee80211_crypto_tkip.c	2006-02-01 21:07:11.000000000 +0100
-+++ madwifi-0.9.2-neu/net80211/ieee80211_crypto_tkip.c	2006-11-11 11:50:03.000000000 +0100
-@@ -38,7 +38,7 @@
-  * AP driver. The code is used with the consent of the author and
-  * it's license is included below.
-  */
--#include <linux/config.h>
-+
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/skbuff.h>
-diff -ur madwifi-0.9.2/net80211/ieee80211_crypto_wep.c madwifi-0.9.2-neu/net80211/ieee80211_crypto_wep.c
---- madwifi-0.9.2/net80211/ieee80211_crypto_wep.c	2006-02-06 21:20:57.000000000 +0100
-+++ madwifi-0.9.2-neu/net80211/ieee80211_crypto_wep.c	2006-11-11 11:50:03.000000000 +0100
-@@ -34,7 +34,7 @@
- /*
-  * IEEE 802.11 WEP crypto support.
-  */
--#include <linux/config.h>
-+
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/skbuff.h>
-diff -ur madwifi-0.9.2/net80211/ieee80211_input.c madwifi-0.9.2-neu/net80211/ieee80211_input.c
---- madwifi-0.9.2/net80211/ieee80211_input.c	2006-07-06 05:23:08.000000000 +0200
-+++ madwifi-0.9.2-neu/net80211/ieee80211_input.c	2006-11-11 11:50:03.000000000 +0100
-@@ -38,7 +38,7 @@
- /*
-  * IEEE 802.11 input handling.
-  */
--#include <linux/config.h>
-+
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/skbuff.h>
-diff -ur madwifi-0.9.2/net80211/ieee80211_linux.c madwifi-0.9.2-neu/net80211/ieee80211_linux.c
---- madwifi-0.9.2/net80211/ieee80211_linux.c	2006-07-21 10:59:10.000000000 +0200
-+++ madwifi-0.9.2-neu/net80211/ieee80211_linux.c	2006-11-11 11:50:03.000000000 +0100
-@@ -33,7 +33,7 @@
- /*
-  * IEEE 802.11 support (Linux-specific code)
-  */
--#include <linux/config.h>
-+
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/kmod.h>
-diff -ur madwifi-0.9.2/net80211/ieee80211_monitor.c madwifi-0.9.2-neu/net80211/ieee80211_monitor.c
---- madwifi-0.9.2/net80211/ieee80211_monitor.c	2006-04-21 18:57:59.000000000 +0200
-+++ madwifi-0.9.2-neu/net80211/ieee80211_monitor.c	2006-11-11 11:50:03.000000000 +0100
-@@ -34,7 +34,7 @@
- /*
-  * IEEE 802.11 monitor mode 
-  */
--#include <linux/config.h>
-+
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/kmod.h>
-diff -ur madwifi-0.9.2/net80211/ieee80211_node.c madwifi-0.9.2-neu/net80211/ieee80211_node.c
---- madwifi-0.9.2/net80211/ieee80211_node.c	2006-06-13 10:50:37.000000000 +0200
-+++ madwifi-0.9.2-neu/net80211/ieee80211_node.c	2006-11-11 11:50:03.000000000 +0100
-@@ -38,7 +38,7 @@
- /*
-  * IEEE 802.11 node handling support.
-  */
--#include <linux/config.h>
-+
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/skbuff.h>
-diff -ur madwifi-0.9.2/net80211/ieee80211_output.c madwifi-0.9.2-neu/net80211/ieee80211_output.c
---- madwifi-0.9.2/net80211/ieee80211_output.c	2006-06-10 04:17:05.000000000 +0200
-+++ madwifi-0.9.2-neu/net80211/ieee80211_output.c	2006-11-11 11:50:03.000000000 +0100
-@@ -38,7 +38,7 @@
- /*
-  * IEEE 802.11 output handling.
-  */
--#include <linux/config.h>
-+
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/skbuff.h>
-diff -ur madwifi-0.9.2/net80211/ieee80211_power.c madwifi-0.9.2-neu/net80211/ieee80211_power.c
---- madwifi-0.9.2/net80211/ieee80211_power.c	2006-06-10 04:17:05.000000000 +0200
-+++ madwifi-0.9.2-neu/net80211/ieee80211_power.c	2006-11-11 11:50:03.000000000 +0100
-@@ -38,7 +38,7 @@
- /*
-  * IEEE 802.11 power save support.
-  */
--#include <linux/config.h>
-+
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/skbuff.h>
-diff -ur madwifi-0.9.2/net80211/ieee80211_proto.c madwifi-0.9.2-neu/net80211/ieee80211_proto.c
---- madwifi-0.9.2/net80211/ieee80211_proto.c	2006-06-09 22:41:19.000000000 +0200
-+++ madwifi-0.9.2-neu/net80211/ieee80211_proto.c	2006-11-11 11:50:03.000000000 +0100
-@@ -38,7 +38,7 @@
- /*
-  * IEEE 802.11 protocol support.
-  */
--#include <linux/config.h>
-+
- #include <linux/version.h>
- #include <linux/kmod.h>
- #include <linux/module.h>
-diff -ur madwifi-0.9.2/net80211/ieee80211_scan.c madwifi-0.9.2-neu/net80211/ieee80211_scan.c
---- madwifi-0.9.2/net80211/ieee80211_scan.c	2006-04-21 18:57:59.000000000 +0200
-+++ madwifi-0.9.2-neu/net80211/ieee80211_scan.c	2006-11-11 11:50:03.000000000 +0100
-@@ -37,7 +37,7 @@
- /*
-  * IEEE 802.11 scanning support.
-  */
--#include <linux/config.h>
-+
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/skbuff.h>
-diff -ur madwifi-0.9.2/net80211/ieee80211_scan_ap.c madwifi-0.9.2-neu/net80211/ieee80211_scan_ap.c
---- madwifi-0.9.2/net80211/ieee80211_scan_ap.c	2006-02-01 21:07:11.000000000 +0100
-+++ madwifi-0.9.2-neu/net80211/ieee80211_scan_ap.c	2006-11-11 11:50:03.000000000 +0100
-@@ -37,7 +37,7 @@
- /*
-  * IEEE 802.11 ap scanning support.
-  */
--#include <linux/config.h>
-+
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/skbuff.h>
-diff -ur madwifi-0.9.2/net80211/ieee80211_scan_sta.c madwifi-0.9.2-neu/net80211/ieee80211_scan_sta.c
---- madwifi-0.9.2/net80211/ieee80211_scan_sta.c	2006-07-02 09:19:37.000000000 +0200
-+++ madwifi-0.9.2-neu/net80211/ieee80211_scan_sta.c	2006-11-11 11:50:03.000000000 +0100
-@@ -37,7 +37,7 @@
- /*
-  * IEEE 802.11 station scanning support.
-  */
--#include <linux/config.h>
-+
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/skbuff.h>
-diff -ur madwifi-0.9.2/net80211/ieee80211_wireless.c madwifi-0.9.2-neu/net80211/ieee80211_wireless.c
---- madwifi-0.9.2/net80211/ieee80211_wireless.c	2006-07-06 05:23:08.000000000 +0200
-+++ madwifi-0.9.2-neu/net80211/ieee80211_wireless.c	2006-11-11 11:50:03.000000000 +0100
-@@ -39,7 +39,7 @@
- /*
-  * Wireless extensions support for 802.11 common code.
-  */
--#include <linux/config.h>
-+
- 
- #ifdef CONFIG_NET_WIRELESS
- #include <linux/version.h>
-diff -ur madwifi-0.9.2/net80211/ieee80211_xauth.c madwifi-0.9.2-neu/net80211/ieee80211_xauth.c
---- madwifi-0.9.2/net80211/ieee80211_xauth.c	2006-02-01 21:07:11.000000000 +0100
-+++ madwifi-0.9.2-neu/net80211/ieee80211_xauth.c	2006-11-11 11:50:03.000000000 +0100
-@@ -46,7 +46,7 @@
-  * of the available callbacks--the user mode authenticator process works
-  * entirely from messages about stations joining and leaving.
-  */
--#include <linux/config.h>
-+
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/init.h>
-diff -ur madwifi-0.9.2/net80211/if_media.c madwifi-0.9.2-neu/net80211/if_media.c
---- madwifi-0.9.2/net80211/if_media.c	2006-05-31 23:05:08.000000000 +0200
-+++ madwifi-0.9.2-neu/net80211/if_media.c	2006-11-11 11:50:03.000000000 +0100
-@@ -49,7 +49,7 @@
- #define	EXPORT_SYMTAB
- #endif
- 
--#include <linux/config.h>
-+
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/kernel.h>
-diff -ur madwifi-0.9.2/regression/ccmp/test_ccmp.c madwifi-0.9.2-neu/regression/ccmp/test_ccmp.c
---- madwifi-0.9.2/regression/ccmp/test_ccmp.c	2006-02-01 21:07:11.000000000 +0100
-+++ madwifi-0.9.2-neu/regression/ccmp/test_ccmp.c	2006-11-11 11:50:02.000000000 +0100
-@@ -44,7 +44,7 @@
-  * you want; e.g. insmod ccmp_test tests=7 will run only test mpdu's
-  * 1, 2, and 3.
-  */
--#include <linux/config.h>
-+
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/init.h>
-diff -ur madwifi-0.9.2/regression/tkip/test_tkip.c madwifi-0.9.2-neu/regression/tkip/test_tkip.c
---- madwifi-0.9.2/regression/tkip/test_tkip.c	2006-02-01 21:07:11.000000000 +0100
-+++ madwifi-0.9.2-neu/regression/tkip/test_tkip.c	2006-11-11 11:50:02.000000000 +0100
-@@ -34,7 +34,7 @@
- /*
-  * TKIP test module.
-  */
--#include <linux/config.h>
-+
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/init.h>
-diff -ur madwifi-0.9.2/regression/wep/test_wep.c madwifi-0.9.2-neu/regression/wep/test_wep.c
---- madwifi-0.9.2/regression/wep/test_wep.c	2006-02-01 21:07:11.000000000 +0100
-+++ madwifi-0.9.2-neu/regression/wep/test_wep.c	2006-11-11 11:50:02.000000000 +0100
-@@ -44,7 +44,7 @@
-  * you want; e.g. insmod wep_test tests=7 will run only test mpdu's
-  * 1, 2, and 3.
-  */
--#include <linux/config.h>
-+
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/init.h>
---- madwifi-0.9.2/Makefile.inc~	2006-07-14 07:15:56.000000000 +0200
-+++ madwifi-0.9.2/Makefile.inc	2006-11-18 10:55:29.000000000 +0100
-@@ -181,7 +181,7 @@
- # 
- TOOLS=  $(DEPTH)/tools 
- 
--COPTS+=	-Werror
-+#COPTS+=	-Werror
- INCS=	-include $(obj)/$(DEPTH)/include/compat.h -I$(obj)/$(DEPTH)/include
- 
- ifeq ($(strip $(BUS)),AHB)
diff --git a/abs/core/madwifi/kernel-2.6.20.patch b/abs/core/madwifi/kernel-2.6.20.patch
deleted file mode 100644
index ced7a23..0000000
--- a/abs/core/madwifi/kernel-2.6.20.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -urNad madwifi-0.9.2+r1842.20061207~/ath/if_ath.c madwifi-0.9.2+r1842.20061207/ath/if_ath.c
---- madwifi-0.9.2+r1842.20061207~/ath/if_ath.c	2006-12-25 23:40:20.000000000 +0900
-+++ madwifi-0.9.2+r1842.20061207/ath/if_ath.c	2006-12-25 23:40:20.968184598 +0900
-@@ -118,7 +118,11 @@
- static void ath_rxorn_tasklet(TQUEUE_ARG);
- static void ath_bmiss_tasklet(TQUEUE_ARG);
- static void ath_bstuck_tasklet(TQUEUE_ARG);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
- static void ath_radar_task(TQUEUE_ARG);
-+#else
-+static void ath_radar_task(struct work_struct *);
-+#endif
- static void ath_dfs_test_return(unsigned long);
- 
- static int ath_stop_locked(struct net_device *);
-@@ -414,8 +418,11 @@
- 	ATH_INIT_TQUEUE(&sc->sc_bstucktq,ath_bstuck_tasklet,	dev);
- 	ATH_INIT_TQUEUE(&sc->sc_rxorntq, ath_rxorn_tasklet,	dev);
- 	ATH_INIT_TQUEUE(&sc->sc_fataltq, ath_fatal_tasklet,	dev);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
- 	ATH_INIT_SCHED_TASK(&sc->sc_radartask, ath_radar_task,	dev);
--
-+#else
-+	ATH_INIT_SCHED_TASK(&sc->sc_radartask, ath_radar_task);
-+#endif
- 	/*
- 	 * Attach the HAL and verify ABI compatibility by checking
- 	 * the HAL's ABI signature against the one the driver was
-@@ -1737,10 +1744,18 @@
- }
- 
- static void
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
- ath_radar_task(TQUEUE_ARG data)
-+#else
-+ath_radar_task(struct work_struct *work)
-+#endif
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
- 	struct net_device *dev = (struct net_device *)data;
- 	struct ath_softc *sc = dev->priv;
-+#else
-+	struct ath_softc *sc = container_of(work, struct ath_softc, sc_radartask);
-+#endif
- 	struct ath_hal *ah = sc->sc_ah;
- 	struct ieee80211com *ic = &sc->sc_ic;
- 	struct ieee80211_channel ichan;
-diff -urNad madwifi-0.9.2+r1842.20061207~/ath/if_athvar.h madwifi-0.9.2+r1842.20061207/ath/if_athvar.h
---- madwifi-0.9.2+r1842.20061207~/ath/if_athvar.h	2006-12-25 23:40:20.000000000 +0900
-+++ madwifi-0.9.2+r1842.20061207/ath/if_athvar.h	2006-12-25 23:40:20.968184598 +0900
-@@ -84,7 +84,11 @@
- #include <linux/workqueue.h>
- #define ATH_SCHEDULE_TASK(t)		schedule_work((t))
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
- #define ATH_INIT_SCHED_TASK(_t, _f, _d)	INIT_WORK((_t), (void (*)(void *))(_f), (void *)(_d));
-+#else
-+#define ATH_INIT_SCHED_TASK(_t, _f)	INIT_WORK((_t), (_f));
-+#endif
- 
- #define ATH_WORK_THREAD			work_struct
- #define	ATH_FLUSH_TASKS			flush_scheduled_work
-diff -urNad madwifi-0.9.2+r1842.20061207~/net80211/ieee80211_linux.h madwifi-0.9.2+r1842.20061207/net80211/ieee80211_linux.h
---- madwifi-0.9.2+r1842.20061207~/net80211/ieee80211_linux.h	2006-08-05 11:05:05.000000000 +0900
-+++ madwifi-0.9.2+r1842.20061207/net80211/ieee80211_linux.h	2006-12-25 23:40:50.452136942 +0900
-@@ -427,6 +427,7 @@
- #define CLONE_KERNEL	(CLONE_FS | CLONE_FILES | CLONE_SIGHAND)
- #endif
- 
-+#include <linux/mm.h>
- #ifndef offset_in_page
- #define	offset_in_page(p) ((unsigned long) (p) & ~PAGE_MASK)
- #endif
\ No newline at end of file
diff --git a/abs/core/madwifi/madwifi-ng.install b/abs/core/madwifi/madwifi-ng.install
index 3711208..68ba9be 100644
--- a/abs/core/madwifi/madwifi-ng.install
+++ b/abs/core/madwifi/madwifi-ng.install
@@ -1,14 +1,14 @@
 post_install() {
-  KERNEL_VERSION='2.6.34-LinHES'
+  KERNEL_VERSION='2.6.36-LinHES'
   depmod -ae $KERNEL_VERSION > /dev/null 2>&1
 }
 
 post_upgrade() {
-  KERNEL_VERSION='2.6.34-LinHES'
+  KERNEL_VERSION='2.6.36-LinHES'
   depmod -ae $KERNEL_VERSION > /dev/null 2>&1
 }
 
 post_remove() {
-  KERNEL_VERSION='2.6.34-LinHES'
+  KERNEL_VERSION='2.6.36-LinHES'
   depmod -ae $KERNEL_VERSION > /dev/null 2>&1
 }