---

yaml --- r: 41712 b: refs/heads/master c: 6b11687 h: refs/heads/master v: v3
git-mirror · Dec 3, 2006 · ea43253 · ea43253
1 parent a10ba65
commit ea43253
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6f5493c1a42b1203e5b0cb0507afd00bb2927bf
+refs/heads/master: 6b11687ef003ed595033da89643c8995676f929d
diff --git a/trunk/include/net/tcp.h b/trunk/include/net/tcp.h
@@ -807,9 +807,9 @@ static inline void tcp_update_wl(struct tcp_sock *tp, u32 ack, u32 seq)
 /*
  * Calculate(/check) TCP checksum
  */
-static inline u16 tcp_v4_check(struct tcphdr *th, int len,
-			       unsigned long saddr, unsigned long daddr, 
-			       unsigned long base)
+static inline __sum16 tcp_v4_check(struct tcphdr *th, int len,
+			       __be32 saddr, __be32 daddr,
+			       __wsum base)
 {
 	return csum_tcpudp_magic(saddr,daddr,len,IPPROTO_TCP,base);
 }

diff --git a/trunk/net/ipv4/udp.c b/trunk/net/ipv4/udp.c
@@ -414,8 +414,9 @@ static void udp_flush_pending_frames(struct sock *sk)
 static void udp4_hwcsum_outgoing(struct sock *sk, struct sk_buff *skb,
 				 __be32 src, __be32 dst, int len      )
 {
-	unsigned int csum = 0, offset;
+	unsigned int offset;
 	struct udphdr *uh = skb->h.uh;
+	__wsum csum = 0;
 
 	if (skb_queue_len(&sk->sk_write_queue) == 1) {
 		/*