From 01caff53897555c4cdc9a5ca8c5cbbf9c4306aeb Mon Sep 17 00:00:00 2001
From: Brian Haley <brian.haley@hp.com>
Date: Fri, 10 Nov 2006 14:54:51 -0800
Subject: [PATCH] --- yaml --- r: 41635 b: refs/heads/master c:
 d3a1be9cba86c4385a5fe46673bbb4730551f454 h: refs/heads/master i:   41633:
 40b5ec215bcbadb5f02f4849743bcc1222c66222   41631:
 e9cf397bb5e96aa536e9139d96ef295c7f14e9f1 v: v3

---
 [refs]                | 2 +-
 trunk/net/ipv6/icmp.c | 2 --
 trunk/net/ipv6/raw.c  | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 8f9f5f2d4306..20dd2eb1f4aa 100644
--- 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
index 52cca93ff2f8..bd51847acd57 100644
--- 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
index 18a90075f942..813fa1d96862 100644
--- 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;