提交 15c1df46 编写于 作者: W William Dauchy 提交者: Yang Yingliang

net, ip6_tunnel: fix namespaces move

stable inclusion
from linux-4.19.100
commit fddb6ea5143a5d92247ffab103d1eaa659de740b

--------------------------------

[ Upstream commit 5311a69a ]

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: NWilliam Dauchy <w.dauchy@criteo.com>
Acked-by: NNicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: NLi Aichun <liaichun@huawei.com>
Reviewed-by: Nguodeqing <geffrey.guo@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 680197f9
......@@ -1882,10 +1882,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;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册