Commit 5311a69a authored by William Dauchy's avatar William Dauchy Committed by David S. Miller

net, ip6_tunnel: fix namespaces move

in the same manner as commit d0f41851 ("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>
parent 36d79af7
...@@ -1877,10 +1877,8 @@ static int ip6_tnl_dev_init(struct net_device *dev) ...@@ -1877,10 +1877,8 @@ static int ip6_tnl_dev_init(struct net_device *dev)
if (err) if (err)
return err; return err;
ip6_tnl_link_config(t); ip6_tnl_link_config(t);
if (t->parms.collect_md) { if (t->parms.collect_md)
dev->features |= NETIF_F_NETNS_LOCAL;
netif_keep_dst(dev); netif_keep_dst(dev);
}
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment