lkml.org 
[lkml]   [2020]   [Jan]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 163/183] net, ip_tunnel: fix namespaces move
    Date
    From: William Dauchy <w.dauchy@criteo.com>

    [ Upstream commit d0f418516022c32ecceaf4275423e5bd3f8743a9 ]

    in the same manner as commit 690afc165bb3 ("net: ip6_gre: fix moving
    ip6gre between namespaces"), fix namespace moving as it was broken since
    commit 2e15ea390e6f ("ip_gre: Add support to collect tunnel metadata.").
    Indeed, the ip6_gre commit removed the local flag for collect_md
    condition, so there is no reason to keep it for ip_gre/ip_tunnel.

    this patch will fix both ip_tunnel and ip_gre modules.

    Fixes: 2e15ea390e6f ("ip_gre: Add support to collect tunnel metadata.")
    Signed-off-by: William Dauchy <w.dauchy@criteo.com>
    Acked-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/ipv4/ip_tunnel.c | 4 +---
    1 file changed, 1 insertion(+), 3 deletions(-)

    --- a/net/ipv4/ip_tunnel.c
    +++ b/net/ipv4/ip_tunnel.c
    @@ -1151,10 +1151,8 @@ int ip_tunnel_init(struct net_device *de
    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);

    \
     
     \ /
      Last update: 2020-01-28 15:14    [W:4.141 / U:0.256 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site