From 6cae46c07b3f32aa25db9433abffc6be382758c0 Mon Sep 17 00:00:00 2001 From: Sascha Hlusiak Date: Sat, 11 Jul 2009 20:30:52 -0700 Subject: [PATCH] --- yaml --- r: 155453 b: refs/heads/master c: f2ba025b2036e52a176cddcf91b15ac2b10c644a h: refs/heads/master i: 155451: cc8aab4184ae0c8e734698fdd4e923d51142fac1 v: v3 --- [refs] | 2 +- trunk/net/ipv6/sit.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4ea100f9be8b..fb4eda29f6b3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e51a67a9c8a2ea5c563f8c2ba6613fe2100ffe67 +refs/heads/master: f2ba025b2036e52a176cddcf91b15ac2b10c644a diff --git a/trunk/net/ipv6/sit.c b/trunk/net/ipv6/sit.c index 68e52308e552..98b7327d0949 100644 --- a/trunk/net/ipv6/sit.c +++ b/trunk/net/ipv6/sit.c @@ -1018,6 +1018,7 @@ static void ipip6_tunnel_setup(struct net_device *dev) dev->hard_header_len = LL_MAX_HEADER + sizeof(struct iphdr); dev->mtu = ETH_DATA_LEN - sizeof(struct iphdr); dev->flags = IFF_NOARP; + dev->priv_flags &= ~IFF_XMIT_DST_RELEASE; dev->iflink = 0; dev->addr_len = 4; dev->features |= NETIF_F_NETNS_LOCAL;