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

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

net, ip6_tunnel: fix namespaces move 



[ Upstream commit 5311a69aaca30fa849c3cc46fb25f75727fb72d0 ]

in the same manner as commit d0f418516022 ("net, ip_tunnel: fix
namespaces move"), fix namespace moving as it was broken since commit
8d79266b ("ip6_tunnel: add collect_md mode to IPv6 tunnel"), but for
ipv6 this time; there is no reason to keep it for ip6_tunnel.

Fixes: 8d79266b ("ip6_tunnel: add collect_md mode to IPv6 tunnel")
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 a99fb020

net/ipv6/ip6_tunnel.c

+1 −3
Original line number Diff line number Diff line
@@ -1861,10 +1861,8 @@ static int ip6_tnl_dev_init(struct net_device *dev) 
	if (err)

		return err;

	ip6_tnl_link_config(t);

	if (t->parms.collect_md) {

		dev->features |= NETIF_F_NETNS_LOCAL;

	if (t->parms.collect_md)

		netif_keep_dst(dev);

	}

	return 0;

}