* [PATCH] net, ip6_tunnel: fix namespaces move
@ 2020-01-21 20:49 William Dauchy
2020-01-22 8:31 ` Nicolas Dichtel
2020-01-22 20:15 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: William Dauchy @ 2020-01-21 20:49 UTC (permalink / raw)
To: netdev; +Cc: Alexei Starovoitov, Nicolas Dichtel, William Dauchy
in the same manner as commit d0f418516022 ("net, ip_tunnel: fix
namespaces move"), fix namespace moving as it was broken since commit
8d79266bc48c ("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: 8d79266bc48c ("ip6_tunnel: add collect_md mode to IPv6 tunnel")
Signed-off-by: William Dauchy <w.dauchy@criteo.com>
---
net/ipv6/ip6_tunnel.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index 2f376dbc37d5..b5dd20c4599b 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -1877,10 +1877,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;
}
--
2.24.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] net, ip6_tunnel: fix namespaces move
2020-01-21 20:49 [PATCH] net, ip6_tunnel: fix namespaces move William Dauchy
@ 2020-01-22 8:31 ` Nicolas Dichtel
2020-01-22 20:15 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Nicolas Dichtel @ 2020-01-22 8:31 UTC (permalink / raw)
To: William Dauchy, netdev; +Cc: Alexei Starovoitov
Le 21/01/2020 à 21:49, William Dauchy a écrit :
> in the same manner as commit d0f418516022 ("net, ip_tunnel: fix
> namespaces move"), fix namespace moving as it was broken since commit
> 8d79266bc48c ("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: 8d79266bc48c ("ip6_tunnel: add collect_md mode to IPv6 tunnel")
> Signed-off-by: William Dauchy <w.dauchy@criteo.com>
Acked-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] net, ip6_tunnel: fix namespaces move
2020-01-21 20:49 [PATCH] net, ip6_tunnel: fix namespaces move William Dauchy
2020-01-22 8:31 ` Nicolas Dichtel
@ 2020-01-22 20:15 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2020-01-22 20:15 UTC (permalink / raw)
To: w.dauchy; +Cc: netdev, ast, nicolas.dichtel
From: William Dauchy <w.dauchy@criteo.com>
Date: Tue, 21 Jan 2020 21:49:54 +0100
> in the same manner as commit d0f418516022 ("net, ip_tunnel: fix
> namespaces move"), fix namespace moving as it was broken since commit
> 8d79266bc48c ("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: 8d79266bc48c ("ip6_tunnel: add collect_md mode to IPv6 tunnel")
> Signed-off-by: William Dauchy <w.dauchy@criteo.com>
Applied and queued up for -stable.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-01-22 20:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-21 20:49 [PATCH] net, ip6_tunnel: fix namespaces move William Dauchy
2020-01-22 8:31 ` Nicolas Dichtel
2020-01-22 20:15 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).