Add upstream patch to work with kernel 2.6.20, #165469.

Package-Manager: portage-2.1.2-r8

4 files changed, 49 insertions, 12 deletions

diff --git a/net-wireless/rt2500/ChangeLog b/net-wireless/rt2500/ChangeLog
index c70c8b1d9872..d47b29844537 100644
--- a/net-wireless/rt2500/ChangeLog
+++ b/net-wireless/rt2500/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/rt2500
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/rt2500/ChangeLog,v 1.34 2006/12/03 20:33:00 uberlord Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/rt2500/ChangeLog,v 1.35 2007/02/06 23:13:37 uberlord Exp $
+
+  06 Feb 2007; Roy Marples <uberlord@gentoo.org>
+  +files/rt2500-1.1.0_beta4-kernel-2.6.20.patch, rt2500-1.1.0_beta4.ebuild:
+  Add upstream patch to work with kernel 2.6.20, #165469.
 
   03 Dec 2006; Roy Marples <uberlord@gentoo.org> rt2500-1.1.0_beta4.ebuild:
   Don't use config.h on 2.6.19 kernels, fixes #154652 thanks to Bernd
diff --git a/net-wireless/rt2500/Manifest b/net-wireless/rt2500/Manifest
index 19d66e29f1e9..5b2f71c5ae87 100644
--- a/net-wireless/rt2500/Manifest
+++ b/net-wireless/rt2500/Manifest
@@ -1,17 +1,21 @@
+AUX rt2500-1.1.0_beta4-kernel-2.6.20.patch 871 RMD160 4b473b854f703c85384b0adf89f0b1149b1526d7 SHA1 d94bdc2d9d474dce87e5a1e56ff62b37cd93b59c SHA256 1133bcb5f042697fd36ac3e808d0e468afc72b523bf7e51d5d19d430ce60024c
+MD5 0c400e9fd109d67ce8563759759e1067 files/rt2500-1.1.0_beta4-kernel-2.6.20.patch 871
+RMD160 4b473b854f703c85384b0adf89f0b1149b1526d7 files/rt2500-1.1.0_beta4-kernel-2.6.20.patch 871
+SHA256 1133bcb5f042697fd36ac3e808d0e468afc72b523bf7e51d5d19d430ce60024c files/rt2500-1.1.0_beta4-kernel-2.6.20.patch 871
 DIST rt2500-1.1.0-b3.tar.gz 305057 RMD160 445f347cd0d5ceb850dfc5900a1c19c82ef23f01 SHA1 bee68bb1e8ed27f98a0cde30e21829bc919481ef SHA256 1fc4700255a9777c3275b34e77acfccd6e9105c916f8a6cc195a97dfdd61a2aa
 DIST rt2500-1.1.0-b4.tar.gz 386980 RMD160 604e6ae067d3fe27a52f595e311bae8c4d18c557 SHA1 dd9a747c819a6507ea3ef9e803d4fae1074d84df SHA256 0c48b157fa2e77268064b5cf9ee956097974f2f4c0caea239e92ae800002a4dc
 EBUILD rt2500-1.1.0_beta3.ebuild 2213 RMD160 f9cbe834869600e3a2b078123ba5ca3dfaed99ba SHA1 4b023fb98a5648e5ea5f6297998ba3ed9a1993df SHA256 1ef09bc098c919e7b913c1a7e67c3858b62f1ffc863474a71f836701666f595d
 MD5 ed395a96f4daa4a9b40895927315ee40 rt2500-1.1.0_beta3.ebuild 2213
 RMD160 f9cbe834869600e3a2b078123ba5ca3dfaed99ba rt2500-1.1.0_beta3.ebuild 2213
 SHA256 1ef09bc098c919e7b913c1a7e67c3858b62f1ffc863474a71f836701666f595d rt2500-1.1.0_beta3.ebuild 2213
-EBUILD rt2500-1.1.0_beta4.ebuild 1570 RMD160 84bf6fabd536886d6f926f09ba758bab014900e4 SHA1 9a6e67b22fec29f6545118b42afabc77bbe0e39e SHA256 b4a7738cc52e17a2bf71f5110b82f84cf7afa460f788045ff8e23de3e72f5ba5
-MD5 6080c6c62e0f26a406becffaa0dc94fb rt2500-1.1.0_beta4.ebuild 1570
-RMD160 84bf6fabd536886d6f926f09ba758bab014900e4 rt2500-1.1.0_beta4.ebuild 1570
-SHA256 b4a7738cc52e17a2bf71f5110b82f84cf7afa460f788045ff8e23de3e72f5ba5 rt2500-1.1.0_beta4.ebuild 1570
-MISC ChangeLog 5969 RMD160 375424955f70e6d9e557f5dc3d8d85f792808fe8 SHA1 2905e973dbfd2cdb336ca1cc381fba8950ddd28a SHA256 de507e979ca467a82cf8c205de7cf324002a70d84cb0f2320b2ba31c1956968e
-MD5 a2d2fc0d3072e4311dcb5644b4562571 ChangeLog 5969
-RMD160 375424955f70e6d9e557f5dc3d8d85f792808fe8 ChangeLog 5969
-SHA256 de507e979ca467a82cf8c205de7cf324002a70d84cb0f2320b2ba31c1956968e ChangeLog 5969
+EBUILD rt2500-1.1.0_beta4.ebuild 1618 RMD160 eb4437f2d0175fbad773f0936b78c14f562b1f58 SHA1 ec77104afd337cf1fa397ae3ab436c8bc887ff56 SHA256 d633bfda3bbda02bc2246c0a79b229bb480e51d0100dc92d6a26893b92f3649a
+MD5 039b75378231b64f25433926c808991a rt2500-1.1.0_beta4.ebuild 1618
+RMD160 eb4437f2d0175fbad773f0936b78c14f562b1f58 rt2500-1.1.0_beta4.ebuild 1618
+SHA256 d633bfda3bbda02bc2246c0a79b229bb480e51d0100dc92d6a26893b92f3649a rt2500-1.1.0_beta4.ebuild 1618
+MISC ChangeLog 6153 RMD160 cb6ee17fd9aa0f8517f8f2fdf25cf7a6d63ab721 SHA1 545b3dea898f6583fc9f6f4434c2c4806f4c3b9a SHA256 bbc6de2820e57f4960618247c22f65378fac3e48b06d056a62a44f7aa3df5cba
+MD5 9576aaa7516d9305630de2eab7f669c8 ChangeLog 6153
+RMD160 cb6ee17fd9aa0f8517f8f2fdf25cf7a6d63ab721 ChangeLog 6153
+SHA256 bbc6de2820e57f4960618247c22f65378fac3e48b06d056a62a44f7aa3df5cba ChangeLog 6153
 MISC metadata.xml 344 RMD160 2f79bcc1b00bc5044034f74427538a1c0829f408 SHA1 7ab30e72fdf815e078229880fc82e4816b0277df SHA256 315758d6bea25daed93d8dafff181b2ec3d5b759d77724d7b31efb2ba59cdeb4
 MD5 2b5e62280e51f48cf22deee6f03a7fa4 metadata.xml 344
 RMD160 2f79bcc1b00bc5044034f74427538a1c0829f408 metadata.xml 344
diff --git a/net-wireless/rt2500/files/rt2500-1.1.0_beta4-kernel-2.6.20.patch b/net-wireless/rt2500/files/rt2500-1.1.0_beta4-kernel-2.6.20.patch
new file mode 100644
index 000000000000..c29f3102c56b
--- /dev/null
+++ b/net-wireless/rt2500/files/rt2500-1.1.0_beta4-kernel-2.6.20.patch
@@ -0,0 +1,27 @@
+--- Module/rtmp_init.c	2006/06/16 07:07:25	1.30
++++ Module/rtmp_init.c	2007/01/22 19:34:22	1.32
+@@ -916,8 +916,12 @@
+ 	DBGPRINT(RT_DEBUG_TRACE, "<-- NICInitAsicFromEEPROM\n");
+ }
+ 
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
++extern VOID MlmeWork(struct work_struct *work);
++#else 
+ extern VOID MlmeWork(void *vpAd);
+-
++#endif
++    
+ void NICInitializeAdapter(IN    PRTMP_ADAPTER   pAdapter)
+ {
+     TXCSR2_STRUC    TxCSR2;
+@@ -974,7 +978,9 @@
+     // Initialze ASIC for TX & Rx operation
+     NICInitializeAsic(pAdapter);
+ 
+-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
++    INIT_WORK(&pAdapter->mlme_work, MlmeWork);
++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
+     INIT_WORK(&pAdapter->mlme_work, MlmeWork, (void*)pAdapter);
+ #endif
+     DBGPRINT(RT_DEBUG_TRACE, "<-- NICInitializeAdapter\n");
diff --git a/net-wireless/rt2500/rt2500-1.1.0_beta4.ebuild b/net-wireless/rt2500/rt2500-1.1.0_beta4.ebuild
index 8514610e9b1d..ec1d5e507749 100644
--- a/net-wireless/rt2500/rt2500-1.1.0_beta4.ebuild
+++ b/net-wireless/rt2500/rt2500-1.1.0_beta4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/rt2500/rt2500-1.1.0_beta4.ebuild,v 1.6 2006/12/03 20:33:00 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/rt2500/rt2500-1.1.0_beta4.ebuild,v 1.7 2007/02/06 23:13:37 uberlord Exp $
 
 inherit eutils linux-mod kde-functions
 set-qtdir 3
@@ -39,6 +39,8 @@ src_unpack() {
 	if kernel_is ge 2 6 19 ; then
 		sed -i -e '/^#include <linux\/config.h> .*/ d' Module/rt_config.h || die
 	fi
+
+	epatch "${FILESDIR}/${P}"-kernel-2.6.20.patch
 }
 
 src_compile() {