Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6769626b authored by William Dauchy's avatar William Dauchy Committed by Greg Kroah-Hartman
Browse files

net, ip_tunnel: fix namespaces move 



[ Upstream commit d0f418516022c32ecceaf4275423e5bd3f8743a9 ]

in the same manner as commit 690afc165bb3 ("net: ip6_gre: fix moving
ip6gre between namespaces"), fix namespace moving as it was broken since
commit 2e15ea39 ("ip_gre: Add support to collect tunnel metadata.").
Indeed, the ip6_gre commit removed the local flag for collect_md
condition, so there is no reason to keep it for ip_gre/ip_tunnel.

this patch will fix both ip_tunnel and ip_gre modules.

Fixes: 2e15ea39 ("ip_gre: Add support to collect tunnel metadata.")
Signed-off-by: default avatarWilliam Dauchy <w.dauchy@criteo.com>
Acked-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent db049045

net/ipv4/ip_tunnel.c

+1 −3
Original line number Diff line number Diff line
@@ -1184,10 +1184,8 @@ int ip_tunnel_init(struct net_device *dev) 
	iph->version		= 4;

	iph->ihl		= 5;



	if (tunnel->collect_md) {

		dev->features |= NETIF_F_NETNS_LOCAL;

	if (tunnel->collect_md)

		netif_keep_dst(dev);

	}

	return 0;

}

EXPORT_SYMBOL_GPL(ip_tunnel_init);