From 66d807fa88f93f45f2774f83beee930806e123b7 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Thu, 28 May 2009 22:35:10 +0000 Subject: [PATCH] --- yaml --- r: 150559 b: refs/heads/master c: 108bfa895cacd1a7c1767e85be105b213e5dce50 h: refs/heads/master i: 150557: 6f265e5ccfc79011846194d99ce9d9aa258ca1b8 150555: 452bcf582ba410cc7bc9d19a60d464309279138b 150551: 5cdf868c97546e1b2f3d46e0118bae1471c2016a 150543: 65e50b85af588b66c815b6ab85e45d60d7de6a0c 150527: 1df12be69c9b9a3fe7034e285c1ce5b42bcadc80 v: v3 --- [refs] | 2 +- trunk/net/ipv4/ip_gre.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 776f5cfbaf54..dd35f73d5c76 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a489e51c1a69c3aa7e7aea925f71c92be5cedbb1 +refs/heads/master: 108bfa895cacd1a7c1767e85be105b213e5dce50 diff --git a/trunk/net/ipv4/ip_gre.c b/trunk/net/ipv4/ip_gre.c index e62510d5ea5a..77436e2732eb 100644 --- a/trunk/net/ipv4/ip_gre.c +++ b/trunk/net/ipv4/ip_gre.c @@ -1238,6 +1238,7 @@ static void ipgre_tunnel_setup(struct net_device *dev) dev->iflink = 0; dev->addr_len = 4; dev->features |= NETIF_F_NETNS_LOCAL; + dev->priv_flags &= ~IFF_XMIT_DST_RELEASE; } static int ipgre_tunnel_init(struct net_device *dev)