From c9152c54eb32e112b4582161b17e686352e25ca9 Mon Sep 17 00:00:00 2001
From: Sascha Hlusiak <contact@saschahlusiak.de>
Date: Tue, 19 May 2009 12:56:48 +0000
Subject: [PATCH] --- yaml --- r: 150334 b: refs/heads/master c:
 8db99e5717507729a9eb49108facb7e528340376 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index fa65389a80e5..42f2a04e3806 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9643f4551255ce8b3ef7470aaaf7f435a20f9182
+refs/heads/master: 8db99e5717507729a9eb49108facb7e528340376
diff --git a/trunk/net/ipv6/sit.c b/trunk/net/ipv6/sit.c
index 664ab82e03b2..e62504133c77 100644
--- a/trunk/net/ipv6/sit.c
+++ b/trunk/net/ipv6/sit.c
@@ -165,8 +165,13 @@ static struct ip_tunnel * ipip6_tunnel_locate(struct net *net,
 	struct sit_net *sitn = net_generic(net, sit_net_id);
 
 	for (tp = __ipip6_bucket(sitn, parms); (t = *tp) != NULL; tp = &t->next) {
-		if (local == t->parms.iph.saddr && remote == t->parms.iph.daddr)
-			return t;
+		if (local == t->parms.iph.saddr &&
+		    remote == t->parms.iph.daddr) {
+			if (create)
+				return NULL;
+			else
+				return t;
+		}
 	}
 	if (!create)
 		goto failed;