---

yaml --- r: 223182 b: refs/heads/master c: 6dcdd1b h: refs/heads/master v: v3
git-mirror · Dec 1, 2010 · 5334f5f · 5334f5f
1 parent a3b9dbe
commit 5334f5f
Show file tree

Hide file tree

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