rpms/kernel/devel linux-2.6-ip6-csum.patch, NONE, 1.1 kernel-2.6.spec, 1.2890, 1.2891

[fedora-cvs-commits at redhat.com]

Author: dwmw2

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-ip6-csum.patch 
Log Message:
IPv6 fix

linux-2.6-ip6-csum.patch:
 ip6_checksum.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-ip6-csum.patch ---
diff --git a/include/net/ip6_checksum.h b/include/net/ip6_checksum.h
index 68e2b32..bc1b0fd 100644
--- a/include/net/ip6_checksum.h
+++ b/include/net/ip6_checksum.h
@@ -87,7 +87,7 @@ static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr,
 	carry = (sum < uproto);
 	sum += carry;
 
-	return csum_fold((__force __wsum)csum);
+	return csum_fold((__force __wsum)sum);
 }
 
 #endif


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2890
retrieving revision 1.2891
diff -u -r1.2890 -r1.2891
--- kernel-2.6.spec	20 Dec 2006 22:28:27 -0000	1.2890
+++ kernel-2.6.spec	21 Dec 2006 15:50:57 -0000	1.2891
@@ -458,6 +458,8 @@
 Patch2201: linux-2.6-sata-ahci-suspend.patch
 Patch2202: linux-2.6-sata-sg_init_one-oops.patch
 
+Patch2300: linux-2.6-ip6-csum.patch
+
 # ACPI bits
 
 #
@@ -989,6 +991,8 @@
 # libata: don't initialize sg in ata_exec_internal() if DMA_NONE
 #%patch2202 -p1
 
+%patch2300 -p1
+
 # ACPI patches
 
 #
@@ -1816,6 +1820,9 @@
 #  - tux.
 
 %changelog
+* Thu Dec 21 2006 David Woodhouse <dwmw2 at redhat.com>
+- Fix IPv6 checksum handling
+
 * Wed Dec 20 2006 David Woodhouse <dwmw2 at redhat.com>
 - Fix BE OHCI support -- write only BE not BE and _then_ LE. Doh.