From 8aaa6c514f0e4a67cf8e7c00aa7348b0383ebcfc Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Thu, 8 Sep 2005 14:27:47 -0700
Subject: [PATCH] --- yaml --- r: 7889 b: refs/heads/master c:
 a57ebc90f1350296edded12d33d7c278831bc3bf h: refs/heads/master i:   7887:
 ef8e504341acb646cbaa71e20dd37542d3ca1de7 v: v3

---
 [refs]                      | 2 +-
 trunk/net/ipv6/ip6_tunnel.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 8e28ec60d1a5..51ed73f1c841 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: baed16a7ff5194487764db300c2753ac7409c4c5
+refs/heads/master: a57ebc90f1350296edded12d33d7c278831bc3bf
diff --git a/trunk/net/ipv6/ip6_tunnel.c b/trunk/net/ipv6/ip6_tunnel.c
index 09613729404c..cf94372d1af3 100644
--- a/trunk/net/ipv6/ip6_tunnel.c
+++ b/trunk/net/ipv6/ip6_tunnel.c
@@ -673,11 +673,12 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev)
 
 	if ((dst = ip6_tnl_dst_check(t)) != NULL)
 		dst_hold(dst);
-	else
+	else {
 		dst = ip6_route_output(NULL, &fl);
 
-	if (dst->error || xfrm_lookup(&dst, &fl, NULL, 0) < 0)
-		goto tx_err_link_failure;
+		if (dst->error || xfrm_lookup(&dst, &fl, NULL, 0) < 0)
+			goto tx_err_link_failure;
+	}
 
 	tdev = dst->dev;