hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: 2e15ea390e ("ip_gre: Add support to collect tunnel metadata.")
Cc: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
Acked-by: Pravin B Shelar <pshelar@ovn.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Haishuang Yan 2017-09-12 17:47:56 +08:00 committed by David S. Miller
parent 6399ebcccf
commit 833a8b4054
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/ipv4/ip_tunnel.c
View File

@ -176,7 +176,7 @@ skip_key_lookup:
return cand; return cand;
t = rcu_dereference(itn->collect_md_tun); t = rcu_dereference(itn->collect_md_tun);
if (t) if (t && t->dev->flags & IFF_UP)
return t; return t;
if (itn->fb_tunnel_dev && itn->fb_tunnel_dev->flags & IFF_UP) if (itn->fb_tunnel_dev && itn->fb_tunnel_dev->flags & IFF_UP)