From 3061787a65042b586e53fb3ce353dad5b6599c15 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Tue, 14 Nov 2006 21:24:30 -0800
Subject: [PATCH] --- yaml --- r: 41709 b: refs/heads/master c:
 9981a0e36a572e9fcf84bfab915fdc93bed0e3c9 h: refs/heads/master i:   41707:
 1652cd910967646048a5de90b80b19e99449391c v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/dccp.h   | 2 +-
 trunk/include/linux/icmp.h   | 2 +-
 trunk/include/linux/icmpv6.h | 2 +-
 trunk/include/linux/igmp.h   | 2 +-
 trunk/include/linux/ip.h     | 2 +-
 trunk/include/linux/tcp.h    | 2 +-
 trunk/include/linux/udp.h    | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 12fb6c1ad2da..5f6d8f69df34 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 56649d5d3c4cb0fe6dd34808ca9f9208d84130ab
+refs/heads/master: 9981a0e36a572e9fcf84bfab915fdc93bed0e3c9
diff --git a/trunk/include/linux/dccp.h b/trunk/include/linux/dccp.h
index d308f1228b61..72cc355d7a03 100644
--- a/trunk/include/linux/dccp.h
+++ b/trunk/include/linux/dccp.h
@@ -30,7 +30,7 @@ struct dccp_hdr {
 #else
 #error  "Adjust your <asm/byteorder.h> defines"
 #endif
-	__u16	dccph_checksum;
+	__sum16	dccph_checksum;
 #if defined(__LITTLE_ENDIAN_BITFIELD)
 	__u8	dccph_x:1,
 		dccph_type:4,
diff --git a/trunk/include/linux/icmp.h b/trunk/include/linux/icmp.h
index 878cfe4e587f..24da4fbc1a2f 100644
--- a/trunk/include/linux/icmp.h
+++ b/trunk/include/linux/icmp.h
@@ -68,7 +68,7 @@
 struct icmphdr {
   __u8		type;
   __u8		code;
-  __be16	checksum;
+  __sum16	checksum;
   union {
 	struct {
 		__be16	id;
diff --git a/trunk/include/linux/icmpv6.h b/trunk/include/linux/icmpv6.h
index dc79396aac25..68d3526c3a05 100644
--- a/trunk/include/linux/icmpv6.h
+++ b/trunk/include/linux/icmpv6.h
@@ -7,7 +7,7 @@ struct icmp6hdr {
 
 	__u8		icmp6_type;
 	__u8		icmp6_code;
-	__be16		icmp6_cksum;
+	__sum16		icmp6_cksum;
 
 
 	union {
diff --git a/trunk/include/linux/igmp.h b/trunk/include/linux/igmp.h
index 21dd56905271..6e7ea2f0a57c 100644
--- a/trunk/include/linux/igmp.h
+++ b/trunk/include/linux/igmp.h
@@ -30,7 +30,7 @@ struct igmphdr
 {
 	__u8 type;
 	__u8 code;		/* For newer IGMP */
-	__be16 csum;
+	__sum16 csum;
 	__be32 group;
 };
 
diff --git a/trunk/include/linux/ip.h b/trunk/include/linux/ip.h
index ecee9bb27d0e..1d36b971a8b5 100644
--- a/trunk/include/linux/ip.h
+++ b/trunk/include/linux/ip.h
@@ -98,7 +98,7 @@ struct iphdr {
 	__be16	frag_off;
 	__u8	ttl;
 	__u8	protocol;
-	__be16	check;
+	__sum16	check;
 	__be32	saddr;
 	__be32	daddr;
 	/*The options start here. */
diff --git a/trunk/include/linux/tcp.h b/trunk/include/linux/tcp.h
index 0aecfc955591..dd61b172ac68 100644
--- a/trunk/include/linux/tcp.h
+++ b/trunk/include/linux/tcp.h
@@ -52,7 +52,7 @@ struct tcphdr {
 #error	"Adjust your <asm/byteorder.h> defines"
 #endif	
 	__be16	window;
-	__be16	check;
+	__sum16	check;
 	__be16	urg_ptr;
 };
 
diff --git a/trunk/include/linux/udp.h b/trunk/include/linux/udp.h
index 564f3b050105..7e08c07efe0f 100644
--- a/trunk/include/linux/udp.h
+++ b/trunk/include/linux/udp.h
@@ -23,7 +23,7 @@ struct udphdr {
 	__be16	source;
 	__be16	dest;
 	__be16	len;
-	__be16	check;
+	__sum16	check;
 };
 
 /* UDP socket options */