From a10ba658e72620e502e88ebab6f3bf1d2ed8c140 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Tue, 14 Nov 2006 21:26:08 -0800
Subject: [PATCH] --- yaml --- r: 41711 b: refs/heads/master c:
 d6f5493c1a42b1203e5b0cb0507afd00bb2927bf h: refs/heads/master i:   41709:
 3061787a65042b586e53fb3ce353dad5b6599c15   41707:
 1652cd910967646048a5de90b80b19e99449391c   41703:
 d21a6266061828bc305cc70c40671a662b49d4a8   41695:
 56ac6e9772f1c9b188d931fd20c6eef4e59fc59d v: v3

---
 [refs]                   | 2 +-
 trunk/include/net/ip.h   | 2 +-
 trunk/net/core/netpoll.c | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index c78f87662d4a..79ae9e8bbdd9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d3bc23e7ee9db8023dff5a86bb3b0069ed018789
+refs/heads/master: d6f5493c1a42b1203e5b0cb0507afd00bb2927bf
diff --git a/trunk/include/net/ip.h b/trunk/include/net/ip.h
index 412e8114667d..eafbcaf728fd 100644
--- a/trunk/include/net/ip.h
+++ b/trunk/include/net/ip.h
@@ -135,7 +135,7 @@ static inline void ip_tr_mc_map(__be32 addr, char *buf)
 
 struct ip_reply_arg {
 	struct kvec iov[1];   
-	u32 	    csum; 
+	__wsum 	    csum;
 	int	    csumoffset; /* u16 offset of csum in iov[0].iov_base */
 				/* -1 if not needed */ 
 }; 
diff --git a/trunk/net/core/netpoll.c b/trunk/net/core/netpoll.c
index edd3246873e8..26ee1791aa02 100644
--- a/trunk/net/core/netpoll.c
+++ b/trunk/net/core/netpoll.c
@@ -78,9 +78,9 @@ static void queue_process(void *p)
 }
 
 static int checksum_udp(struct sk_buff *skb, struct udphdr *uh,
-			unsigned short ulen, u32 saddr, u32 daddr)
+			unsigned short ulen, __be32 saddr, __be32 daddr)
 {
-	unsigned int psum;
+	__wsum psum;
 
 	if (uh->check == 0 || skb->ip_summed == CHECKSUM_UNNECESSARY)
 		return 0;