From 5334f5f11aaa64165abcc801da19dc26b7f9662b Mon Sep 17 00:00:00 2001
From: David McCullough <david_mccullough@mcafee.com>
Date: Mon, 29 Nov 2010 19:32:34 +0000
Subject: [PATCH] --- yaml --- r: 223182 b: refs/heads/master c:
 6dcdd1b3694a4fa2b85167a9c860c7613a7553c7 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index a52f604749d3..0826aaa6ec9b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d13a2cb63d06fe2e3067c7d40f9a5946abd614c8
+refs/heads/master: 6dcdd1b3694a4fa2b85167a9c860c7613a7553c7
diff --git a/trunk/net/ipv6/sit.c b/trunk/net/ipv6/sit.c
index d6bfaec3bbbf..8c4d00c7cd2b 100644
--- a/trunk/net/ipv6/sit.c
+++ b/trunk/net/ipv6/sit.c
@@ -606,8 +606,9 @@ static int ipip6_rcv(struct sk_buff *skb)
 		return 0;
 	}
 
-	icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
+	/* no tunnel matched,  let upstream know, ipsec may handle it */
 	rcu_read_unlock();
+	return 1;
 out:
 	kfree_skb(skb);
 	return 0;