---

yaml --- r: 41635 b: refs/heads/master c: d3a1be9 h: refs/heads/master i: 41633: 40b5ec2 41631: e9cf397 v: v3
git-mirror · Dec 3, 2006 · 01caff5 · 01caff5
1 parent 15b87e2
commit 01caff5
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f465e489c457821751f6253abaaf28c10f9d8895
+refs/heads/master: d3a1be9cba86c4385a5fe46673bbb4730551f454
diff --git a/trunk/net/ipv6/icmp.c b/trunk/net/ipv6/icmp.c
@@ -247,8 +247,6 @@ static int icmpv6_push_pending_frames(struct sock *sk, struct flowi *fl, struct
 					   len, fl->proto, tmp_csum);
 		icmp6h->icmp6_cksum = tmp_csum;
 	}
-	if (icmp6h->icmp6_cksum == 0)
-		icmp6h->icmp6_cksum = -1;
 	ip6_push_pending_frames(sk);
 out:
 	return err;

diff --git a/trunk/net/ipv6/raw.c b/trunk/net/ipv6/raw.c
@@ -536,7 +536,7 @@ static int rawv6_push_pending_frames(struct sock *sk, struct flowi *fl,
 				   &fl->fl6_dst,
 				   total_len, fl->proto, tmp_csum);
 
-	if (tmp_csum == 0)
+	if (tmp_csum == 0 && fl->proto == IPPROTO_UDP)
 		tmp_csum = -1;
 
 	csum = tmp_csum;