---

yaml --- r: 150334 b: refs/heads/master c: 8db99e5 h: refs/heads/master v: v3
git-mirror · May 19, 2009 · c9152c5 · c9152c5
1 parent 8388cd5
commit c9152c5
Show file tree

Hide file tree

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