From 17f2209169331ad8f6d3dfa245067cf691ec4d5e Mon Sep 17 00:00:00 2001
From: Anders Franzen <anders.franzen@ericsson.com>
Date: Tue, 19 Oct 2010 03:50:47 +0000
Subject: [PATCH] --- yaml --- r: 218392 b: refs/heads/master c:
 7e223de84b73c621b90755dc4d8c8128e673b529 h: refs/heads/master 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 feafba6502bb..d34b0817ed7c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d618222352ac95ff9a21f1fc1018fffeb8952194
+refs/heads/master: 7e223de84b73c621b90755dc4d8c8128e673b529
diff --git a/trunk/net/ipv6/ip6_tunnel.c b/trunk/net/ipv6/ip6_tunnel.c
index c2c0f89397b1..38b9a56c173f 100644
--- a/trunk/net/ipv6/ip6_tunnel.c
+++ b/trunk/net/ipv6/ip6_tunnel.c
@@ -1371,6 +1371,7 @@ static void ip6_tnl_dev_setup(struct net_device *dev)
 	dev->flags |= IFF_NOARP;
 	dev->addr_len = sizeof(struct in6_addr);
 	dev->features |= NETIF_F_NETNS_LOCAL;
+	dev->priv_flags &= ~IFF_XMIT_DST_RELEASE;
 }