summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schweizer <genstef@gentoo.org>2007-06-24 09:52:12 +0000
committerStefan Schweizer <genstef@gentoo.org>2007-06-24 09:52:12 +0000
commit046c8dd297a532463dfd8fcb90b36a999144b65b (patch)
tree75e9096b5c203e0528a16fcc3c029bb9a4f825c6 /net-wireless/at76c503a
parentfixing dev-util/glade for bug #172106 (diff)
downloadgentoo-2-046c8dd297a532463dfd8fcb90b36a999144b65b.tar.gz
gentoo-2-046c8dd297a532463dfd8fcb90b36a999144b65b.tar.bz2
gentoo-2-046c8dd297a532463dfd8fcb90b36a999144b65b.zip
Add init work patch thanks to Ryan Hendrickson <rhendric@mit.edu> in bug 182866
(Portage version: 2.1.3_rc5)
Diffstat (limited to 'net-wireless/at76c503a')
-rw-r--r--net-wireless/at76c503a/ChangeLog6
-rw-r--r--net-wireless/at76c503a/at76c503a-0.14_beta1.ebuild3
-rw-r--r--net-wireless/at76c503a/files/at76c503a-2.6.20-init_work.patch30
3 files changed, 37 insertions, 2 deletions
diff --git a/net-wireless/at76c503a/ChangeLog b/net-wireless/at76c503a/ChangeLog
index a720715e4778..d6f1215f0072 100644
--- a/net-wireless/at76c503a/ChangeLog
+++ b/net-wireless/at76c503a/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-wireless/at76c503a
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/at76c503a/ChangeLog,v 1.15 2007/05/09 19:22:21 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/at76c503a/ChangeLog,v 1.16 2007/06/24 09:52:12 genstef Exp $
+
+ 24 Jun 2007; Stefan Schweizer <genstef@gentoo.org>
+ +files/at76c503a-2.6.20-init_work.patch, at76c503a-0.14_beta1.ebuild:
+ Add init work patch thanks to Ryan Hendrickson <rhendric@mit.edu> in bug 182866
09 May 2007; Stefan Schweizer <genstef@gentoo.org>
+files/at76c503a-2.6.20.patch, at76c503a-0.14_beta1.ebuild:
diff --git a/net-wireless/at76c503a/at76c503a-0.14_beta1.ebuild b/net-wireless/at76c503a/at76c503a-0.14_beta1.ebuild
index 82bcbd6c1e5d..d1b419483319 100644
--- a/net-wireless/at76c503a/at76c503a-0.14_beta1.ebuild
+++ b/net-wireless/at76c503a/at76c503a-0.14_beta1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/at76c503a/at76c503a-0.14_beta1.ebuild,v 1.4 2007/05/09 19:22:21 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/at76c503a/at76c503a-0.14_beta1.ebuild,v 1.5 2007/06/24 09:52:12 genstef Exp $
inherit linux-mod eutils
@@ -31,6 +31,7 @@ pkg_setup() {
src_unpack() {
unpack ${A}
cd ${S}
+ epatch ${FILESDIR}/at76c503a-2.6.20-init_work.patch
epatch ${FILESDIR}/at76c503a-2.6.20.patch
}
diff --git a/net-wireless/at76c503a/files/at76c503a-2.6.20-init_work.patch b/net-wireless/at76c503a/files/at76c503a-2.6.20-init_work.patch
new file mode 100644
index 000000000000..9aa555096779
--- /dev/null
+++ b/net-wireless/at76c503a/files/at76c503a-2.6.20-init_work.patch
@@ -0,0 +1,30 @@
+--- at76c503.c~ 2007-06-22 00:35:09.000000000 -0400
++++ at76c503.c 2007-06-22 00:34:28.000000000 -0400
+@@ -2299,9 +2299,15 @@
+ dev->netdev->name, flag);
+ }
+
++#if KERNEL_VERSION(2,6,20) > LINUX_VERSION_CODE
+ static void kevent(void *data)
+ {
+ struct at76c503 *dev = data;
++#else
++static void kevent(struct work_struct *work)
++{
++ struct at76c503 *dev = container_of(work, struct at76c503, kevent);
++#endif
+ int ret;
+ unsigned long flags;
+
+@@ -6371,7 +6377,11 @@
+ dev->netdev = netdev;
+
+ init_MUTEX (&dev->sem);
++#if KERNEL_VERSION(2,6,20) > LINUX_VERSION_CODE
+ INIT_WORK (&dev->kevent, kevent, dev);
++#else
++ INIT_WORK (&dev->kevent, kevent);
++#endif
+
+ dev->open_count = 0;
+