diff options
| author |   Michael Marineau <marineam@gentoo.org> | 2007-07-15 18:00:11 +0000 |
|---|---|---|
| committer | Michael Marineau <marineam@gentoo.org> | 2007-07-15 18:00:11 +0000 |
| commit | af8eaf345dc65c6993c592b837c22118ac06e070 (patch) | |
| tree | 6ebefab7abe6ed16509fbda05d62b24401d7914f /sys-kernel | |
| parent | Version bump, 0.6.1 is released (diff) | |
| download | gentoo-2-af8eaf345dc65c6993c592b837c22118ac06e070.tar.gz gentoo-2-af8eaf345dc65c6993c592b837c22118ac06e070.tar.bz2 gentoo-2-af8eaf345dc65c6993c592b837c22118ac06e070.zip | |
Fix SCTP compile error
(Portage version: 2.1.2.9)
Diffstat (limited to 'sys-kernel')
| -rw-r--r-- | sys-kernel/xen-sources/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-kernel/xen-sources/files/xen-sources-2.6.16.52-sctp-skb_linearize-fix.patch | 12 | ||||
| -rw-r--r-- | sys-kernel/xen-sources/xen-sources-2.6.16.52.ebuild | 5 |
3 files changed, 21 insertions, 3 deletions
diff --git a/sys-kernel/xen-sources/ChangeLog b/sys-kernel/xen-sources/ChangeLog index c07f6ea4ca2b..2d453f81e231 100644 --- a/sys-kernel/xen-sources/ChangeLog +++ b/sys-kernel/xen-sources/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-kernel/xen-sources # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xen-sources/ChangeLog,v 1.40 2007/07/10 19:42:31 marineam Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xen-sources/ChangeLog,v 1.41 2007/07/15 18:00:11 marineam Exp $ + + 15 Jul 2007; Michael Marineau <marineam@gentoo.org> + +files/xen-sources-2.6.16.52-sctp-skb_linearize-fix.patch, + xen-sources-2.6.16.52.ebuild: + Add fix for sctp compile error, resolves bug #185406. *xen-sources-2.6.16.52 (10 Jul 2007) diff --git a/sys-kernel/xen-sources/files/xen-sources-2.6.16.52-sctp-skb_linearize-fix.patch b/sys-kernel/xen-sources/files/xen-sources-2.6.16.52-sctp-skb_linearize-fix.patch new file mode 100644 index 000000000000..431fc96936ff --- /dev/null +++ b/sys-kernel/xen-sources/files/xen-sources-2.6.16.52-sctp-skb_linearize-fix.patch @@ -0,0 +1,12 @@ +diff -rup linux-2.6.16.52-xen.orig/net/sctp/input.c linux-2.6.16.52-xen/net/sctp/input.c +--- linux-2.6.16.52-xen.orig/net/sctp/input.c 2007-07-15 10:07:12.000000000 -0700 ++++ linux-2.6.16.52-xen/net/sctp/input.c 2007-07-15 10:42:38.000000000 -0700 +@@ -134,7 +134,7 @@ int sctp_rcv(struct sk_buff *skb) + + SCTP_INC_STATS_BH(SCTP_MIB_INSCTPPACKS); + +- if (skb_linearize(skb, GFP_ATOMIC)) ++ if (skb_linearize(skb)) + goto discard_it; + + sh = (struct sctphdr *) skb->h.raw; diff --git a/sys-kernel/xen-sources/xen-sources-2.6.16.52.ebuild b/sys-kernel/xen-sources/xen-sources-2.6.16.52.ebuild index 31d5ef1a3274..e8eb2070e87c 100644 --- a/sys-kernel/xen-sources/xen-sources-2.6.16.52.ebuild +++ b/sys-kernel/xen-sources/xen-sources-2.6.16.52.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/sys-kernel/xen-sources/xen-sources-2.6.16.52.ebuild,v 1.1 2007/07/10 19:42:31 marineam Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xen-sources/xen-sources-2.6.16.52.ebuild,v 1.2 2007/07/15 18:00:11 marineam Exp $ ETYPE="sources" UNIPATCH_STRICTORDER="1" @@ -17,7 +17,8 @@ PATCH_URI="mirror://gentoo/${XEN_PATCH}" SRC_URI="${KERNEL_URI} ${PATCH_URI}" UNIPATCH_LIST="${DISTDIR}/${XEN_PATCH} - ${FILESDIR}/${P}-ipt-reject-fix.patch" + ${FILESDIR}/${P}-ipt-reject-fix.patch + ${FILESDIR}/${P}-sctp-skb_linearize-fix.patch" KEYWORDS="~x86 ~amd64" |