Add 2.6.19 support patches thanks to Horst Schirmeier <gentoo@schirmeier.com> and Martin Heimburger <vispillo@vispillo.org> in bug 152595

(Portage version: 2.1.2_rc1-r7)

5 files changed, 432 insertions, 2 deletions

diff --git a/net-wireless/madwifi-ng/ChangeLog b/net-wireless/madwifi-ng/ChangeLog
index 9d034c75c214..8535fa8a48d2 100644
--- a/net-wireless/madwifi-ng/ChangeLog
+++ b/net-wireless/madwifi-ng/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-wireless/madwifi-ng
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/ChangeLog,v 1.16 2006/09/24 09:32:34 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/ChangeLog,v 1.17 2006/11/17 18:36:53 genstef Exp $
+
+  17 Nov 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/madwifi-ng-0.9.2-ath_intr.diff,
+  +files/madwifi-ng-0.9.2-config.h.diff,
+  +files/madwifi-ng-0.9.2-crypto_cipher_encrypt_one.diff,
+  madwifi-ng-0.9.2.ebuild:
+  Add 2.6.19 support patches thanks to Horst Schirmeier
+  <gentoo@schirmeier.com> and Martin Heimburger <vispillo@vispillo.org> in bug
+  152595
 
   24 Sep 2006; Michael Hanselmann <hansmi@gentoo.org>
   madwifi-ng-0.9.2.ebuild:
diff --git a/net-wireless/madwifi-ng/files/madwifi-ng-0.9.2-ath_intr.diff b/net-wireless/madwifi-ng/files/madwifi-ng-0.9.2-ath_intr.diff
new file mode 100644
index 000000000000..6dc16f3e62ff
--- /dev/null
+++ b/net-wireless/madwifi-ng/files/madwifi-ng-0.9.2-ath_intr.diff
@@ -0,0 +1,29 @@
+Index: trunk/ath/if_ath.c
+===================================================================
+--- trunk/ath/if_ath.c (revision 1751)
++++ trunk/ath/if_ath.c (revision 1752)
+@@ -1600,5 +1600,9 @@
+  */
+ irqreturn_t
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
++ath_intr(int irq, void *dev_id)
++#else
+ ath_intr(int irq, void *dev_id, struct pt_regs *regs)
++#endif
+ {
+ 	struct net_device *dev = dev_id;
+Index: trunk/ath/if_athvar.h
+===================================================================
+--- trunk/ath/if_athvar.h (revision 1726)
++++ trunk/ath/if_athvar.h (revision 1752)
+@@ -727,5 +727,9 @@
+ void ath_suspend(struct net_device *);
+ void ath_shutdown(struct net_device *);
+-irqreturn_t ath_intr(int, void *, struct pt_regs *);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
++irqreturn_t ath_intr(int, void *);
++#else
++irqreturn_t ath_intr(int, void *, struct pt_regs *regs);
++#endif
+ int ath_ioctl_ethtool(struct ath_softc *, int, void __user *);
+ void bus_read_cachesize(struct ath_softc *, u_int8_t *);
diff --git a/net-wireless/madwifi-ng/files/madwifi-ng-0.9.2-config.h.diff b/net-wireless/madwifi-ng/files/madwifi-ng-0.9.2-config.h.diff
new file mode 100644
index 000000000000..a78a57186ad5
--- /dev/null
+++ b/net-wireless/madwifi-ng/files/madwifi-ng-0.9.2-config.h.diff
@@ -0,0 +1,372 @@
+Index: trunk/ath/if_ath.c
+===================================================================
+--- trunk/ath/if_ath.c (revision 1720)
++++ trunk/ath/if_ath.c (revision 1721)
+@@ -45,5 +45,7 @@
+ #include "opt_ah.h"
+ 
++#ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
++#endif
+ #include <linux/version.h>
+ #include <linux/module.h>
+Index: trunk/ath/if_ath_ahb.c
+===================================================================
+--- trunk/ath/if_ath_ahb.c (revision 1714)
++++ trunk/ath/if_ath_ahb.c (revision 1721)
+@@ -11,5 +11,7 @@
+ #endif
+ 
++#ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
++#endif
+ #include <linux/version.h>
+ #include <linux/module.h>
+Index: trunk/ath/if_ath_pci.c
+===================================================================
+--- trunk/ath/if_ath_pci.c (revision 1714)
++++ trunk/ath/if_ath_pci.c (revision 1721)
+@@ -43,5 +43,7 @@
+ #endif
+ 
++#ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
++#endif
+ #include <linux/version.h>
+ #include <linux/module.h>
+Index: trunk/ath_rate/amrr/amrr.c
+===================================================================
+--- trunk/ath_rate/amrr/amrr.c (revision 1667)
++++ trunk/ath_rate/amrr/amrr.c (revision 1721)
+@@ -44,5 +44,7 @@
+  *    Mathieu Lacage, Hossein Manshaei, Thierry Turletti
+  */
++#ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
++#endif
+ #include <linux/version.h>
+ #include <linux/module.h>
+Index: trunk/ath_rate/onoe/onoe.c
+===================================================================
+--- trunk/ath_rate/onoe/onoe.c (revision 1667)
++++ trunk/ath_rate/onoe/onoe.c (revision 1721)
+@@ -40,5 +40,7 @@
+  * Atsushi Onoe's rate control algorithm.
+  */
++#ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
++#endif
+ #include <linux/version.h>
+ #include <linux/module.h>
+Index: trunk/ath_rate/sample/sample.c
+===================================================================
+--- trunk/ath_rate/sample/sample.c (revision 1667)
++++ trunk/ath_rate/sample/sample.c (revision 1721)
+@@ -42,5 +42,7 @@
+  */
+ 
++#ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
++#endif
+ #include <linux/version.h>
+ #include <linux/module.h>
+Index: trunk/hal/linux/ah_osdep.c
+===================================================================
+--- trunk/hal/linux/ah_osdep.c (revision 1711)
++++ trunk/hal/linux/ah_osdep.c (revision 1721)
+@@ -42,5 +42,7 @@
+ #endif
+ 
++#ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
++#endif
+ #include <linux/version.h>
+ #include <linux/module.h>
+Index: trunk/net80211/ieee80211.c
+===================================================================
+--- trunk/net80211/ieee80211.c (revision 1666)
++++ trunk/net80211/ieee80211.c (revision 1721)
+@@ -39,5 +39,7 @@
+  * IEEE 802.11 generic handler
+  */
++#ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
++#endif
+ #include <linux/version.h>
+ #include <linux/module.h>
+Index: trunk/net80211/ieee80211_acl.c
+===================================================================
+--- trunk/net80211/ieee80211_acl.c (revision 1614)
++++ trunk/net80211/ieee80211_acl.c (revision 1721)
+@@ -46,5 +46,7 @@
+  * or rejected (ACL_POLICY_DENT).
+  */
++#ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
++#endif
+ #include <linux/version.h>
+ #include <linux/module.h>
+Index: trunk/net80211/ieee80211_beacon.c
+===================================================================
+--- trunk/net80211/ieee80211_beacon.c (revision 1575)
++++ trunk/net80211/ieee80211_beacon.c (revision 1721)
+@@ -39,5 +39,7 @@
+  * IEEE 802.11 beacon handling routines
+  */
++#ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
++#endif
+ #include <linux/version.h>
+ #include <linux/module.h>
+Index: trunk/net80211/ieee80211_crypto.c
+===================================================================
+--- trunk/net80211/ieee80211_crypto.c (revision 1426)
++++ trunk/net80211/ieee80211_crypto.c (revision 1721)
+@@ -39,5 +39,7 @@
+  * IEEE 802.11 generic crypto support.
+  */
++#ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
++#endif
+ #include <linux/version.h>
+ #include <linux/module.h>
+Index: trunk/net80211/ieee80211_crypto_ccmp.c
+===================================================================
+--- trunk/net80211/ieee80211_crypto_ccmp.c (revision 1643)
++++ trunk/net80211/ieee80211_crypto_ccmp.c (revision 1721)
+@@ -39,5 +39,7 @@
+  * it's license is included below.
+  */
++#ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
++#endif
+ #include <linux/version.h>
+ #include <linux/module.h>
+Index: trunk/net80211/ieee80211_crypto_none.c
+===================================================================
+--- trunk/net80211/ieee80211_crypto_none.c (revision 1426)
++++ trunk/net80211/ieee80211_crypto_none.c (revision 1721)
+@@ -35,5 +35,7 @@
+  * IEEE 802.11 NULL crypto support.
+  */
++#ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
++#endif
+ #include <linux/version.h>
+ #include <linux/module.h>
+Index: trunk/net80211/ieee80211_crypto_tkip.c
+===================================================================
+--- trunk/net80211/ieee80211_crypto_tkip.c (revision 1426)
++++ trunk/net80211/ieee80211_crypto_tkip.c (revision 1721)
+@@ -39,5 +39,7 @@
+  * it's license is included below.
+  */
++#ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
++#endif
+ #include <linux/version.h>
+ #include <linux/module.h>
+Index: trunk/net80211/ieee80211_crypto_wep.c
+===================================================================
+--- trunk/net80211/ieee80211_crypto_wep.c (revision 1443)
++++ trunk/net80211/ieee80211_crypto_wep.c (revision 1721)
+@@ -35,5 +35,7 @@
+  * IEEE 802.11 WEP crypto support.
+  */
++#ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
++#endif
+ #include <linux/version.h>
+ #include <linux/module.h>
+Index: trunk/net80211/ieee80211_input.c
+===================================================================
+--- trunk/net80211/ieee80211_input.c (revision 1713)
++++ trunk/net80211/ieee80211_input.c (revision 1721)
+@@ -39,5 +39,7 @@
+  * IEEE 802.11 input handling.
+  */
++#ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
++#endif
+ #include <linux/version.h>
+ #include <linux/module.h>
+Index: trunk/net80211/ieee80211_linux.c
+===================================================================
+--- trunk/net80211/ieee80211_linux.c (revision 1690)
++++ trunk/net80211/ieee80211_linux.c (revision 1721)
+@@ -34,5 +34,7 @@
+  * IEEE 802.11 support (Linux-specific code)
+  */
++#ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
++#endif
+ #include <linux/version.h>
+ #include <linux/module.h>
+Index: trunk/net80211/ieee80211_monitor.c
+===================================================================
+--- trunk/net80211/ieee80211_monitor.c (revision 1720)
++++ trunk/net80211/ieee80211_monitor.c (revision 1721)
+@@ -35,5 +35,7 @@
+  * IEEE 802.11 monitor mode 
+  */
++#ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
++#endif
+ #include <linux/version.h>
+ #include <linux/module.h>
+Index: trunk/net80211/ieee80211_node.c
+===================================================================
+--- trunk/net80211/ieee80211_node.c (revision 1640)
++++ trunk/net80211/ieee80211_node.c (revision 1721)
+@@ -39,5 +39,7 @@
+  * IEEE 802.11 node handling support.
+  */
++#ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
++#endif
+ #include <linux/version.h>
+ #include <linux/module.h>
+Index: trunk/net80211/ieee80211_output.c
+===================================================================
+--- trunk/net80211/ieee80211_output.c (revision 1637)
++++ trunk/net80211/ieee80211_output.c (revision 1721)
+@@ -39,5 +39,7 @@
+  * IEEE 802.11 output handling.
+  */
++#ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
++#endif
+ #include <linux/version.h>
+ #include <linux/module.h>
+Index: trunk/net80211/ieee80211_power.c
+===================================================================
+--- trunk/net80211/ieee80211_power.c (revision 1637)
++++ trunk/net80211/ieee80211_power.c (revision 1721)
+@@ -39,5 +39,7 @@
+  * IEEE 802.11 power save support.
+  */
++#ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
++#endif
+ #include <linux/version.h>
+ #include <linux/module.h>
+Index: trunk/net80211/ieee80211_proto.c
+===================================================================
+--- trunk/net80211/ieee80211_proto.c (revision 1699)
++++ trunk/net80211/ieee80211_proto.c (revision 1721)
+@@ -39,5 +39,7 @@
+  * IEEE 802.11 protocol support.
+  */
++#ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
++#endif
+ #include <linux/version.h>
+ #include <linux/kmod.h>
+Index: trunk/net80211/ieee80211_scan.c
+===================================================================
+--- trunk/net80211/ieee80211_scan.c (revision 1698)
++++ trunk/net80211/ieee80211_scan.c (revision 1721)
+@@ -38,5 +38,7 @@
+  * IEEE 802.11 scanning support.
+  */
++#ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
++#endif
+ #include <linux/version.h>
+ #include <linux/module.h>
+Index: trunk/net80211/ieee80211_scan_ap.c
+===================================================================
+--- trunk/net80211/ieee80211_scan_ap.c (revision 1698)
++++ trunk/net80211/ieee80211_scan_ap.c (revision 1721)
+@@ -38,5 +38,7 @@
+  * IEEE 802.11 ap scanning support.
+  */
++#ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
++#endif
+ #include <linux/version.h>
+ #include <linux/module.h>
+Index: trunk/net80211/ieee80211_scan_sta.c
+===================================================================
+--- trunk/net80211/ieee80211_scan_sta.c (revision 1698)
++++ trunk/net80211/ieee80211_scan_sta.c (revision 1721)
+@@ -38,5 +38,7 @@
+  * IEEE 802.11 station scanning support.
+  */
++#ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
++#endif
+ #include <linux/version.h>
+ #include <linux/module.h>
+Index: trunk/net80211/ieee80211_wireless.c
+===================================================================
+--- trunk/net80211/ieee80211_wireless.c (revision 1717)
++++ trunk/net80211/ieee80211_wireless.c (revision 1721)
+@@ -40,5 +40,7 @@
+  * Wireless extensions support for 802.11 common code.
+  */
++#ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
++#endif
+ 
+ #ifdef CONFIG_NET_WIRELESS
+Index: trunk/net80211/ieee80211_xauth.c
+===================================================================
+--- trunk/net80211/ieee80211_xauth.c (revision 1426)
++++ trunk/net80211/ieee80211_xauth.c (revision 1721)
+@@ -47,5 +47,7 @@
+  * entirely from messages about stations joining and leaving.
+  */
++#ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
++#endif
+ #include <linux/version.h>
+ #include <linux/module.h>
+Index: trunk/net80211/if_media.c
+===================================================================
+--- trunk/net80211/if_media.c (revision 1614)
++++ trunk/net80211/if_media.c (revision 1721)
+@@ -50,5 +50,7 @@
+ #endif
+ 
++#ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
++#endif
+ #include <linux/version.h>
+ #include <linux/module.h>
+Index: trunk/regression/ccmp/test_ccmp.c
+===================================================================
+--- trunk/regression/ccmp/test_ccmp.c (revision 1426)
++++ trunk/regression/ccmp/test_ccmp.c (revision 1721)
+@@ -45,5 +45,7 @@
+  * 1, 2, and 3.
+  */
++#ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
++#endif
+ #include <linux/version.h>
+ #include <linux/module.h>
+Index: trunk/regression/tkip/test_tkip.c
+===================================================================
+--- trunk/regression/tkip/test_tkip.c (revision 1426)
++++ trunk/regression/tkip/test_tkip.c (revision 1721)
+@@ -35,5 +35,7 @@
+  * TKIP test module.
+  */
++#ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
++#endif
+ #include <linux/version.h>
+ #include <linux/module.h>
+Index: trunk/regression/wep/test_wep.c
+===================================================================
+--- trunk/regression/wep/test_wep.c (revision 1426)
++++ trunk/regression/wep/test_wep.c (revision 1721)
+@@ -45,5 +45,7 @@
+  * 1, 2, and 3.
+  */
++#ifndef AUTOCONF_INCLUDED
+ #include <linux/config.h>
++#endif
+ #include <linux/version.h>
+ #include <linux/module.h>
diff --git a/net-wireless/madwifi-ng/files/madwifi-ng-0.9.2-crypto_cipher_encrypt_one.diff b/net-wireless/madwifi-ng/files/madwifi-ng-0.9.2-crypto_cipher_encrypt_one.diff
new file mode 100644
index 000000000000..dd660c81a6cd
--- /dev/null
+++ b/net-wireless/madwifi-ng/files/madwifi-ng-0.9.2-crypto_cipher_encrypt_one.diff
@@ -0,0 +1,19 @@
+Index: trunk/net80211/ieee80211_crypto_ccmp.c
+===================================================================
+--- trunk/net80211/ieee80211_crypto_ccmp.c (revision 1732)
++++ trunk/net80211/ieee80211_crypto_ccmp.c (revision 1745)
+@@ -300,4 +300,8 @@
+ rijndael_encrypt(struct crypto_tfm *tfm, const void *src, void *dst)
+ {
++/* FIXME: check for Linux 2.6.19 or newer once it's released */
++#ifdef CRYPTO_ALG_ASYNC
++	crypto_cipher_encrypt_one(tfm, dst, src);
++#else
+ 	struct scatterlist sg_src;
+ 	struct scatterlist sg_dst;
+@@ -311,4 +315,5 @@
+ 	sg_dst.length = AES_BLOCK_LEN;
+ 	crypto_cipher_encrypt(tfm, &sg_dst, &sg_src, AES_BLOCK_LEN);
++#endif
+ }
+ 
diff --git a/net-wireless/madwifi-ng/madwifi-ng-0.9.2.ebuild b/net-wireless/madwifi-ng/madwifi-ng-0.9.2.ebuild
index 1c0e76119515..b757cd999153 100644
--- a/net-wireless/madwifi-ng/madwifi-ng-0.9.2.ebuild
+++ b/net-wireless/madwifi-ng/madwifi-ng-0.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/madwifi-ng-0.9.2.ebuild,v 1.7 2006/09/24 09:32:34 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/madwifi-ng-0.9.2.ebuild,v 1.8 2006/11/17 18:36:53 genstef Exp $
 
 inherit linux-mod
 
@@ -68,6 +68,7 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
+	epatch ${FILESDIR}/${P}-{ath_intr,config.h,crypto_cipher_encrypt_one}.diff
 	for dir in ath net80211 ath_rate/amrr ath_rate/onoe ath_rate/sample; do
 		convert_to_m ${S}/${dir}/Makefile
 	done