Merge tag 'char-misc-5.6-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux.git] / net / ipv4 / ip_tunnel.c

diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c
index 0fe2a5d3e258fb4220155690016d28761fdde14c..74e1d964a615280d59370a4c958726e2cef7d474 100644 (file)
--- a/net/ipv4/ip_tunnel.c
+++ b/net/ipv4/ip_tunnel.c
@@ -1236,10 +1236,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);