diff options
| author | Haishuang Yan <yanhaishuang@cmss.chinamobile.com> | 2017-09-12 17:47:57 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-09-12 20:45:31 -0700 |
| commit | 6c1cb4393cc7e7107e4e94a9a0744451296ca8a6 (patch) | |
| tree | a77f82af47f4e9c9c8f16d20f050acbab9e17ebc | |
| parent | 833a8b405465e935a1ff7ab086b54a3ef90437ca (diff) | |
| download | linux-stable-6c1cb4393cc7e7107e4e94a9a0744451296ca8a6.tar.gz linux-stable-6c1cb4393cc7e7107e4e94a9a0744451296ca8a6.tar.bz2 linux-stable-6c1cb4393cc7e7107e4e94a9a0744451296ca8a6.zip | |
ip6_tunnel: fix ip6 tunnel lookup in collect_md mode
In collect_md mode, if the tun dev is down, it still can call
__ip6_tnl_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: 8d79266bc48c ("ip6_tunnel: add collect_md mode to IPv6 tunnels")
Cc: Alexei Starovoitov <ast@fb.com>
Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv6/ip6_tunnel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index 10a693a19323..ae73164559d5 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -171,7 +171,7 @@ ip6_tnl_lookup(struct net *net, const struct in6_addr *remote, const struct in6_ } t = rcu_dereference(ip6n->collect_md_tun); - if (t) + if (t && t->dev->flags & IFF_UP) return t; t = rcu_dereference(ip6n->tnls_wc[0]); |