From: Haishuang Yan Date: Tue, 12 Sep 2017 09:47:56 +0000 (+0800) Subject: ip_tunnel: fix ip tunnel lookup in collect_md mode X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=833a8b405465e935a1ff7ab086b54a3ef90437ca;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git ip_tunnel: fix ip tunnel lookup in collect_md mode In collect_md mode, if the tun dev is down, it still can call ip_tunnel_rcv to receive on packets, and the rx statistics increase improperly. When the md tunnel is down, it's not neccessary to increase RX drops for the tunnel device, packets would be recieved on fallback tunnel, and the RX drops on fallback device will be increased as expected. Fixes: 2e15ea390e6f ("ip_gre: Add support to collect tunnel metadata.") Cc: Pravin B Shelar Signed-off-by: Haishuang Yan Acked-by: Pravin B Shelar Signed-off-by: David S. Miller --- diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c index e1856bfa753d..e9805ad664ac 100644 --- a/net/ipv4/ip_tunnel.c +++ b/net/ipv4/ip_tunnel.c @@ -176,7 +176,7 @@ skip_key_lookup: return cand; t = rcu_dereference(itn->collect_md_tun); - if (t) + if (t && t->dev->flags & IFF_UP) return t; if (itn->fb_tunnel_dev && itn->fb_tunnel_dev->flags & IFF_UP)