rpms/kernel/FC-6 linux-2.6-csum-missing-line.patch, NONE, 1.1.2.1 kernel-2.6.spec, 1.2947.2.1, 1.2947.2.2

[fedora-cvs-commits at redhat.com]

Author: ehabkost

Update of /cvs/dist/rpms/kernel/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv17939

Modified Files:
      Tag: private-ehabkost-bz223258-branch
	kernel-2.6.spec 
Added Files:
      Tag: private-ehabkost-bz223258-branch
	linux-2.6-csum-missing-line.patch 
Log Message:
Patch adding missing line in the csum patches

Subject: Set csum_start when setting csum_offset

The new csum model requires csum_start to be set for csum_offset to
be meaningful.


Updating the spec %changelog, also.


linux-2.6-csum-missing-line.patch:
 skbuff.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE linux-2.6-csum-missing-line.patch ---
Date: Sat, 28 Apr 2007 16:23:31 +1000
From: Herbert Xu <herbert.xu at redhat.com>
Subject: [XEN]: Set csum_start when setting csum_offset
Message-ID: <20070428062331.GA6461 at gondor.apana.org.au>

On Fri, Apr 27, 2007 at 09:40:03PM -0300, Eduardo Pereira Habkost wrote:
> 
> On CVS, rpms/kernel-xen-2.6/devel, branch private-ehabkost-xen-3_0_5-branch.

Thanks.  It looks like somewhere along the line I managed to
lose an important line in the patch.


The new csum model requires csum_start to be set for csum_offset to
be meaningful.

Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>

Cheers,
-- 
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert at gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
--- linux-2.6.20.i386/drivers/xen/core/skbuff.c	2007-04-28 15:30:16.000000000 +1000
+++ build-2.6.20.i386/drivers/xen/core/skbuff.c	2007-04-28 15:30:52.000000000 +1000
@@ -89,6 +89,7 @@
 	skb->h.raw = (unsigned char *)skb->nh.iph + 4*skb->nh.iph->ihl;
 	if (skb->h.raw >= skb->tail)
 		goto out;
+	skb->csum_start = skb->h.raw - skb->head;
 	switch (skb->nh.iph->protocol) {
 	case IPPROTO_TCP:
 		skb->csum_offset = offsetof(struct tcphdr, check);




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v
retrieving revision 1.2947.2.1
retrieving revision 1.2947.2.2
diff -u -r1.2947.2.1 -r1.2947.2.2
--- kernel-2.6.spec	27 Apr 2007 19:43:16 -0000	1.2947.2.1
+++ kernel-2.6.spec	30 Apr 2007 21:28:22 -0000	1.2947.2.2
@@ -510,6 +510,7 @@
 Patch1661: linux-2.6-use_csum_start_offset_instead.patch
 Patch1662: linux-2.6-treat_partial_as_unnecessary.patch
 Patch1663: linux-2.6-kill_skbuff_hack.patch
+Patch1664: linux-2.6-csum-missing-line.patch
 
 Patch1682: linux-2.6-xfs_attr2.patch
 Patch1690: linux-2.6-PT_LOAD-align.patch
@@ -1234,6 +1235,7 @@
 %patch1661 -p1
 %patch1662 -p1
 %patch1663 -p1
+%patch1664 -p1
 
 # Fix attr2 corruption with btree data extents
 %patch1682 -p1
@@ -2305,6 +2307,9 @@
 %endif
 
 %changelog
+* Mon Apr 30 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Included checksum patches to fix bug #223258
+
 * Thu Apr 26 2007 Chuck Ebbert <cebbert at redhat.com>		1.2947
 - 2.6.20.8 (official)
 - 2.6.20.9