diff options
| author |   Roy Marples <uberlord@gentoo.org> | 2007-02-06 23:13:37 +0000 |
|---|---|---|
| committer | Roy Marples <uberlord@gentoo.org> | 2007-02-06 23:13:37 +0000 |
| commit | 3fa2f9432e6372fa1874aefdf3d0237dc71236ed (patch) | |
| tree | 399b4fc25005288dbadd8b7a3f312c8bd5e23a79 /net-wireless/rt2500 | |
| parent | version bump (diff) | |
| download | gentoo-2-3fa2f9432e6372fa1874aefdf3d0237dc71236ed.tar.gz gentoo-2-3fa2f9432e6372fa1874aefdf3d0237dc71236ed.tar.bz2 gentoo-2-3fa2f9432e6372fa1874aefdf3d0237dc71236ed.zip | |
Add upstream patch to work with kernel 2.6.20, #165469.
(Portage version: 2.1.2-r8)
Diffstat (limited to 'net-wireless/rt2500')
| -rw-r--r-- | net-wireless/rt2500/ChangeLog | 8 | ||||
| -rw-r--r-- | net-wireless/rt2500/files/rt2500-1.1.0_beta4-kernel-2.6.20.patch | 27 | ||||
| -rw-r--r-- | net-wireless/rt2500/rt2500-1.1.0_beta4.ebuild | 6 |
3 files changed, 37 insertions, 4 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/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() { |