From faa3c2f752186e245c2c9006513dd7024c8f248c Mon Sep 17 00:00:00 2001 From: Mike Auty Date: Sat, 10 Feb 2007 00:48:41 +0000 Subject: [PATCH] Fix up 'unable to attach hardware' problem, bug 165477. Package-Manager: portage-2.1.2-r8 --- net-wireless/madwifi-ng/ChangeLog | 6 ++++- net-wireless/madwifi-ng/Manifest | 26 +++++++++++++------ .../madwifi-ng-0.9.2.1-linux-2.6.20.patch | 24 +++++++++++++++++ 3 files changed, 47 insertions(+), 9 deletions(-) diff --git a/net-wireless/madwifi-ng/ChangeLog b/net-wireless/madwifi-ng/ChangeLog index 8501c7abc2ae..c627007983f6 100644 --- a/net-wireless/madwifi-ng/ChangeLog +++ b/net-wireless/madwifi-ng/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-wireless/madwifi-ng # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/ChangeLog,v 1.23 2007/02/05 20:16:44 dsd Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/ChangeLog,v 1.24 2007/02/10 00:48:41 ikelos Exp $ + + 10 Feb 2007; Mike Auty + files/madwifi-ng-0.9.2.1-linux-2.6.20.patch: + Fix up 'unable to attach hardware' problem, bug 165477. 05 Feb 2007; Daniel Drake +files/madwifi-ng-0.9.2.1-linux-2.6.20.patch, madwifi-ng-0.9.2.1.ebuild: diff --git a/net-wireless/madwifi-ng/Manifest b/net-wireless/madwifi-ng/Manifest index b2ed4345e197..7bc08f4e6583 100644 --- a/net-wireless/madwifi-ng/Manifest +++ b/net-wireless/madwifi-ng/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX madwifi-association-fix.patch 2530 RMD160 405689db0b214e2e4378a2471a9584b2195440e3 SHA1 c4d67684238c51a4632ae9e01caabe9750f705fa SHA256 787fc4061571fe87f0a1575189743974ebbce73c7ee07e66d37731f234caf8ff MD5 6f2c3ea19061fa433c6777e202fb636c files/madwifi-association-fix.patch 2530 RMD160 405689db0b214e2e4378a2471a9584b2195440e3 files/madwifi-association-fix.patch 2530 @@ -14,10 +17,10 @@ AUX madwifi-ng-0.9.2-crypto_cipher_encrypt_one.diff 653 RMD160 96450d5320e381761 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-0.9.2.1-linux-2.6.20.patch 5244 RMD160 ca8d3c869c84861b8a33d53f8bcd47e9451a8603 SHA1 7902ef5c29b1cec356e38d54960879ba57e3bc78 SHA256 6bbdca5a514ec04aaa5beae2e8d91aab35a735988160f1cd54505531e621e1de -MD5 cc0c49f8d4d8f70b6e57c258ccd6f5d2 files/madwifi-ng-0.9.2.1-linux-2.6.20.patch 5244 -RMD160 ca8d3c869c84861b8a33d53f8bcd47e9451a8603 files/madwifi-ng-0.9.2.1-linux-2.6.20.patch 5244 -SHA256 6bbdca5a514ec04aaa5beae2e8d91aab35a735988160f1cd54505531e621e1de files/madwifi-ng-0.9.2.1-linux-2.6.20.patch 5244 +AUX madwifi-ng-0.9.2.1-linux-2.6.20.patch 6240 RMD160 dafc042865d7cc5e487d5ecf5c6bd1428fd2f866 SHA1 c47e0415a26fab5e88862c044a1f601b64d3475a SHA256 d5eea77279187314011c536d644a948f91047bbd0ea0ef3849bbd64122e57a32 +MD5 d87e52249fc7224d08dc51adc10f6f75 files/madwifi-ng-0.9.2.1-linux-2.6.20.patch 6240 +RMD160 dafc042865d7cc5e487d5ecf5c6bd1428fd2f866 files/madwifi-ng-0.9.2.1-linux-2.6.20.patch 6240 +SHA256 d5eea77279187314011c536d644a948f91047bbd0ea0ef3849bbd64122e57a32 files/madwifi-ng-0.9.2.1-linux-2.6.20.patch 6240 AUX madwifi-ng-r1886.patch 965 RMD160 86389659efbd846c12153c7e11043f0fb3c7fd8b SHA1 cda44aff6e99ade85b736cc2f31b13cfee6c3721 SHA256 e068fbfaf9c2f27ac9670b6fc43939ceade0e6c40df88d5e23006be640ca0fbe MD5 e72b6534fc8941fd6c890f2ecbf470e6 files/madwifi-ng-r1886.patch 965 RMD160 86389659efbd846c12153c7e11043f0fb3c7fd8b files/madwifi-ng-r1886.patch 965 @@ -36,10 +39,10 @@ EBUILD madwifi-ng-0.9.2.ebuild 3979 RMD160 2cf8e74c6ffca193ab6276eb5e6bc3f794b2b 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 13639 RMD160 f37254877752c073d6ba5a203c633d7c15574997 SHA1 9661784ac465f3447d37e52d2e558eee28f2370a SHA256 b77e1dfde37e1b1859ccc6fdf1205326b1e80842695dc3d1362ac96e5b8e2cde -MD5 9984e29ad49e5cf701a81d9b10cc18d0 ChangeLog 13639 -RMD160 f37254877752c073d6ba5a203c633d7c15574997 ChangeLog 13639 -SHA256 b77e1dfde37e1b1859ccc6fdf1205326b1e80842695dc3d1362ac96e5b8e2cde ChangeLog 13639 +MISC ChangeLog 13793 RMD160 7ae1c2c90e00ac277819bf59822ddca0f2062be1 SHA1 40f949cf5dc030f68ae24e88f0b78241aac77c37 SHA256 1ec8ab976101058be01e150d12df185e48a204ca163ef90f493c900721d1568d +MD5 340713835a3473bb85892172240dd68f ChangeLog 13793 +RMD160 7ae1c2c90e00ac277819bf59822ddca0f2062be1 ChangeLog 13793 +SHA256 1ec8ab976101058be01e150d12df185e48a204ca163ef90f493c900721d1568d ChangeLog 13793 MISC metadata.xml 256 RMD160 af310503f82b971c1d6e8e1a5282d455f3427a3e SHA1 c7c8144660775d9edc93ea9cfb820944f7eb3109 SHA256 0bece0d60e3a88523cbaab4bfaafc904a11efd49099bc37388954a243a096f59 MD5 1e76dba4899dcc307c5a880a729e20ee metadata.xml 256 RMD160 af310503f82b971c1d6e8e1a5282d455f3427a3e metadata.xml 256 @@ -50,3 +53,10 @@ SHA256 21c57d899d4e2d74e3c820476f60b36c356764e54fe6f3be3acc69d663a0eb8d files/di MD5 4759e10919b6002661f86f34d4d1bc7b files/digest-madwifi-ng-0.9.2.1 253 RMD160 2e13cbbae0eb8588a73d66fd4760e0c2dcd3f077 files/digest-madwifi-ng-0.9.2.1 253 SHA256 fad1921d8e6f2fbd11167b5ddc0af6eb24ac70b17b7e8e5fa6eec1400fe0bae0 files/digest-madwifi-ng-0.9.2.1 253 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.2 (GNU/Linux) + +iD8DBQFFzRZ7u7rWomwgFXoRAuOqAJ4nwa+LiqPJLy3HX7nnVKbb0TR5lACfaDYO +ykltrux0FfXj8+M7lHxm660= +=QvEu +-----END PGP SIGNATURE----- diff --git a/net-wireless/madwifi-ng/files/madwifi-ng-0.9.2.1-linux-2.6.20.patch b/net-wireless/madwifi-ng/files/madwifi-ng-0.9.2.1-linux-2.6.20.patch index cabdbb6c547c..aa7d28627cc1 100644 --- a/net-wireless/madwifi-ng/files/madwifi-ng-0.9.2.1-linux-2.6.20.patch +++ b/net-wireless/madwifi-ng/files/madwifi-ng-0.9.2.1-linux-2.6.20.patch @@ -1,3 +1,27 @@ +Index: madwifi-0.9.2.1/ath_hal/ah_osdep.h +=================================================================== +--- madwifi-0.9.2.1.orig/hal/linux/ah_osdep.h ++++ madwifi-0.9.2.1/hal/linux/ah_osdep.h +@@ -40,12 +40,12 @@ + + /* +- * Starting with 2.6.4 the kernel supports a configuration option +- * to pass parameters in registers. If this is enabled we must +- * mark all function interfaces in+out of the HAL to pass parameters +- * on the stack as this is the convention used internally (for +- * maximum portability). ++ * Linux on i386 may pass parameters in registers. This is an option ++ * starting with Linux 2.6.4. Starting with Linux 2.6.20, it's done ++ * unconditionally. However, the HAL uses standard ABI whereas the ++ * parameters are passed on the stack (for maximum portability). ++ * "asmlinkage" forces the standard ABI for the HAL calls. + */ +-#ifdef CONFIG_REGPARM +-#define __ahdecl __attribute__((regparm(0))) ++#ifdef __i386__ ++#define __ahdecl asmlinkage + #else + #define __ahdecl Index: madwifi-0.9.2.1/ath/if_ath.c =================================================================== --- madwifi-0.9.2.1.orig/ath/if_ath.c -- 2.26.2