From: Al Viro <viro@zeniv.linux.org.uk>
Date: Wed, 15 Nov 2006 05:26:08 +0000 (-0800)
Subject: [NET]: Annotate callers of csum_tcpudp_nofold() in net/*
X-Git-Tag: v2.6.20-rc2~6^2~13^2~324
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d6f5493c1a42b1203e5b0cb0507afd00bb2927bf;p=linux-2.6-omap-h63xx.git

[NET]: Annotate callers of csum_tcpudp_nofold() in net/*

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/include/net/ip.h b/include/net/ip.h
index 412e8114667..eafbcaf728f 100644
--- a/include/net/ip.h
+++ b/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/net/core/netpoll.c b/net/core/netpoll.c
index edd3246873e..26ee1791aa0 100644
--- a/net/core/netpoll.c
+++ b/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;