---

yaml --- r: 41711 b: refs/heads/master c: d6f5493 h: refs/heads/master i: 41709: 3061787 41707: 1652cd9 41703: d21a626 41695: 56ac6e9 v: v3
git-mirror · Dec 3, 2006 · a10ba65 · a10ba65
1 parent 3bf8b5a
commit a10ba65
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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;