From 074be7d132d594f2b8a3556debfe3621aa80f402 Mon Sep 17 00:00:00 2001
From: "Denis V. Lunev" <den@openvz.org>
Date: Mon, 18 Feb 2008 20:49:36 -0800
Subject: [PATCH] --- yaml --- r: 85847 b: refs/heads/master c:
 9937ded8e44de8865cba1509d24eea9d350cebf0 h: refs/heads/master i:   85845:
 6a20e99795e87c25d0b9a9c2f8a141bc5acddf40   85843:
 d0d3370b0d963d86339e86ccb8e6deaab2fd2b76   85839:
 21f8bb5398591bebbfa9131db856aa24bf5c39ba v: v3

---
 [refs]                      | 2 +-
 trunk/net/ipv6/ip6_tunnel.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ac1d9f2ddfa2..698d178dfff8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ac62dc773c149d7b7124b4912b425842f905d3e
+refs/heads/master: 9937ded8e44de8865cba1509d24eea9d350cebf0
diff --git a/trunk/net/ipv6/ip6_tunnel.c b/trunk/net/ipv6/ip6_tunnel.c
index 9031e521c1df..cd940647bd12 100644
--- a/trunk/net/ipv6/ip6_tunnel.c
+++ b/trunk/net/ipv6/ip6_tunnel.c
@@ -550,6 +550,7 @@ ip4ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
 			ip_rt_put(rt);
 			goto out;
 		}
+		skb2->dst = (struct dst_entry *)rt;
 	} else {
 		ip_rt_put(rt);
 		if (ip_route_input(skb2, eiph->daddr, eiph->saddr, eiph->tos,