From 6f265e5ccfc79011846194d99ce9d9aa258ca1b8 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Thu, 28 May 2009 10:44:30 +0000 Subject: [PATCH] --- yaml --- r: 150557 b: refs/heads/master c: 28e72216d7e7af7050f171a87c1eecba93d01ea6 h: refs/heads/master i: 150555: 452bcf582ba410cc7bc9d19a60d464309279138b v: v3 --- [refs] | 2 +- trunk/net/ipv4/ipip.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ea4e22ff78ad..d0a06413535b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cdd0db058d64f2619b08e7d098ee0014aa0a5bc1 +refs/heads/master: 28e72216d7e7af7050f171a87c1eecba93d01ea6 diff --git a/trunk/net/ipv4/ipip.c b/trunk/net/ipv4/ipip.c index 9054139795af..bb2f1b17fbf1 100644 --- a/trunk/net/ipv4/ipip.c +++ b/trunk/net/ipv4/ipip.c @@ -713,6 +713,7 @@ static void ipip_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 void ipip_tunnel_init(struct net_device *dev)