Add 2.6.19 support patches thanks to Horst Schirmeier <gentoo@schirmeier.com> and...

Package-Manager: portage-2.1.2_rc1-r7

diff --git a/net-wireless/madwifi-ng/ChangeLog b/net-wireless/madwifi-ng/ChangeLog
index 9d034c75c2140035c95d05fa926330b8342ba69d..8535fa8a48d29e2e280ed1ceb8eb0dc450827d3d 100644 (file)
--- 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/Manifest b/net-wireless/madwifi-ng/Manifest
index 8b45f9f8340fcdb03937cc4a0bd5a31de4c517f1..da55cd741732c3da5ad7a53392c46c6113400db1 100644 (file)
--- a/net-wireless/madwifi-ng/Manifest
+++ b/net-wireless/madwifi-ng/Manifest
@@ -2,6 +2,18 @@ AUX madwifi-association-fix.patch 2530 RMD160 405689db0b214e2e4378a2471a9584b219
 MD5 6f2c3ea19061fa433c6777e202fb636c files/madwifi-association-fix.patch 2530
 RMD160 405689db0b214e2e4378a2471a9584b2195440e3 files/madwifi-association-fix.patch 2530
 SHA256 787fc4061571fe87f0a1575189743974ebbce73c7ee07e66d37731f234caf8ff files/madwifi-association-fix.patch 2530
+AUX madwifi-ng-0.9.2-ath_intr.diff 1020 RMD160 83f1b90f9b47c8d8caafde3ab9e332d59a469901 SHA1 b154f9d9c1a2e0f9e57d8d60a8c624b86b4716a3 SHA256 3f87b4bf731c1b9e22b8e6ec5b9d630235e76c6b0f89d6511a05d513df75fc0e
+MD5 a450776510e9dfb027100a9477aea1e1 files/madwifi-ng-0.9.2-ath_intr.diff 1020
+RMD160 83f1b90f9b47c8d8caafde3ab9e332d59a469901 files/madwifi-ng-0.9.2-ath_intr.diff 1020
+SHA256 3f87b4bf731c1b9e22b8e6ec5b9d630235e76c6b0f89d6511a05d513df75fc0e files/madwifi-ng-0.9.2-ath_intr.diff 1020
+AUX madwifi-ng-0.9.2-config.h.diff 11817 RMD160 dc6691e89bb4e5010e5e09563614fb5321980c79 SHA1 c38c1326119be212ac1c1c88839a32a36b65b35d SHA256 45c76499437553fab487ecb8b19f86b5177107c5ec441317d774d60f54879746
+MD5 9bd7989a6c7f25ed9bae201b4e721ecf files/madwifi-ng-0.9.2-config.h.diff 11817
+RMD160 dc6691e89bb4e5010e5e09563614fb5321980c79 files/madwifi-ng-0.9.2-config.h.diff 11817
+SHA256 45c76499437553fab487ecb8b19f86b5177107c5ec441317d774d60f54879746 files/madwifi-ng-0.9.2-config.h.diff 11817
+AUX madwifi-ng-0.9.2-crypto_cipher_encrypt_one.diff 653 RMD160 96450d5320e3817612880e86342c699f297680d3 SHA1 eccde455495548d7650163b2eba9950b442bd441 SHA256 9b808b094b3eb41874ce943077a8e6862501d8b71be21140be3a4623a7f2ff35
+MD5 7ec7bc646805244f713c1afdb698f211 files/madwifi-ng-0.9.2-crypto_cipher_encrypt_one.diff 653
+RMD160 96450d5320e3817612880e86342c699f297680d3 files/madwifi-ng-0.9.2-crypto_cipher_encrypt_one.diff 653
+SHA256 9b808b094b3eb41874ce943077a8e6862501d8b71be21140be3a4623a7f2ff35 files/madwifi-ng-0.9.2-crypto_cipher_encrypt_one.diff 653
 AUX madwifi-ng-uudecode-gcda-fix.patch 328 RMD160 c68566dc426c1ca15b3f858e2696735db8c3fb9e SHA1 553ce53acb0ae781a83715951857414a36d25e80 SHA256 f1a4293ba3235b312d9048cff1f79695c16dd19210e68d0fe07fa1819de21f9d
 MD5 a0e4e3918e720015a4416efc14431c47 files/madwifi-ng-uudecode-gcda-fix.patch 328
 RMD160 c68566dc426c1ca15b3f858e2696735db8c3fb9e files/madwifi-ng-uudecode-gcda-fix.patch 328
@@ -17,14 +29,14 @@ EBUILD madwifi-ng-0.0.1531.20060427.ebuild 3833 RMD160 67faea5002ea4b0c66839347e
 MD5 ab3aaecb8e5e2e6441ac700489ea11b3 madwifi-ng-0.0.1531.20060427.ebuild 3833
 RMD160 67faea5002ea4b0c66839347e9f496e0de554042 madwifi-ng-0.0.1531.20060427.ebuild 3833
 SHA256 c39fa01684c2eadb1dc1985d821b672cc97c8d20b5ede36b4cf49b3769174dc1 madwifi-ng-0.0.1531.20060427.ebuild 3833
-EBUILD madwifi-ng-0.9.2.ebuild 3902 RMD160 b81d76b836c47ef2b1e86a1caa65973a45458361 SHA1 7cb3e70278ebf9340cf8ee656f732ba45301e612 SHA256 95bd305b799bc9b3b69d0e9db6f523162fea61e17beb6d652a7bd21547e08281
-MD5 eedd5acce34b622aeb2c162137399b0b madwifi-ng-0.9.2.ebuild 3902
-RMD160 b81d76b836c47ef2b1e86a1caa65973a45458361 madwifi-ng-0.9.2.ebuild 3902
-SHA256 95bd305b799bc9b3b69d0e9db6f523162fea61e17beb6d652a7bd21547e08281 madwifi-ng-0.9.2.ebuild 3902
-MISC ChangeLog 12345 RMD160 62483164af850da34e78f9bb1d33b477c83e128c SHA1 4d44de01987898c9ffaf0991409a984149d04ba7 SHA256 db690eb88a8711929adf0c26ef68845982e4e43db3414f440d75f5ba75a71e3e
-MD5 4f6fa234f4f83820b212f6676fc871bf ChangeLog 12345
-RMD160 62483164af850da34e78f9bb1d33b477c83e128c ChangeLog 12345
-SHA256 db690eb88a8711929adf0c26ef68845982e4e43db3414f440d75f5ba75a71e3e ChangeLog 12345
+EBUILD madwifi-ng-0.9.2.ebuild 3979 RMD160 2cf8e74c6ffca193ab6276eb5e6bc3f794b2b09a SHA1 3b8378b22791ac5a529e8aca0727ccd79ef790c1 SHA256 e18668de4da9160799c33a94448f54a05dac134d61429b86576496c1e373e4d6
+MD5 82d58a8bcb92317ce472b3ef6cf4e717 madwifi-ng-0.9.2.ebuild 3979
+RMD160 2cf8e74c6ffca193ab6276eb5e6bc3f794b2b09a madwifi-ng-0.9.2.ebuild 3979
+SHA256 e18668de4da9160799c33a94448f54a05dac134d61429b86576496c1e373e4d6 madwifi-ng-0.9.2.ebuild 3979
+MISC ChangeLog 12711 RMD160 4b0c10a6a9d740acb41eedd60ee76571313ffd8c SHA1 9a85245748187105932aaa3c915d698363f15fdc SHA256 83d12eb8cd77ca9819955e65b0c636c3a819f3e74c0e4f696b4a5a5f7f1caf17
+MD5 2d15b6d3f5bdad1389056dad4988c933 ChangeLog 12711
+RMD160 4b0c10a6a9d740acb41eedd60ee76571313ffd8c ChangeLog 12711
+SHA256 83d12eb8cd77ca9819955e65b0c636c3a819f3e74c0e4f696b4a5a5f7f1caf17 ChangeLog 12711
 MISC metadata.xml 256 RMD160 af310503f82b971c1d6e8e1a5282d455f3427a3e SHA1 c7c8144660775d9edc93ea9cfb820944f7eb3109 SHA256 0bece0d60e3a88523cbaab4bfaafc904a11efd49099bc37388954a243a096f59
 MD5 1e76dba4899dcc307c5a880a729e20ee metadata.xml 256
 RMD160 af310503f82b971c1d6e8e1a5282d455f3427a3e metadata.xml 256

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 (file)
index 0000000..6dc16f3
--- /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 (file)
index 0000000..a78a571
--- /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 (file)
index 0000000..dd660c8
--- /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 1c0e7611951510e547d4a922fb0e72c0b8579dbe..b757cd999153e381c5b6982ae8c95c743baf1f8b 100644 (file)
--- 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