Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751505AbdILJsY (ORCPT ); Tue, 12 Sep 2017 05:48:24 -0400 Received: from cmccmta1.chinamobile.com ([221.176.66.79]:57434 "EHLO cmccmta1.chinamobile.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751326AbdILJsU (ORCPT ); Tue, 12 Sep 2017 05:48:20 -0400 X-RM-TRANSID: 2ee159b7ad62a57-13ab7 X-RM-SPAM-FLAG: 00000000 X-RM-TRANSID: 2ee359b7ad61196-6fbf2 From: Haishuang Yan To: "David S. Miller" , Alexey Kuznetsov , Hideaki YOSHIFUJI Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Haishuang Yan , Alexei Starovoitov Subject: [PATCH v4 2/2] ip6_tunnel: fix ip6 tunnel lookup in collect_md mode Date: Tue, 12 Sep 2017 17:47:57 +0800 Message-Id: <1505209677-12728-2-git-send-email-yanhaishuang@cmss.chinamobile.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1505209677-12728-1-git-send-email-yanhaishuang@cmss.chinamobile.com> References: <1505209677-12728-1-git-send-email-yanhaishuang@cmss.chinamobile.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1099 Lines: 37 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 Signed-off-by: Haishuang Yan --- Change since v4: * Make the commit message more clearer * Fix wrong recipient address --- net/ipv6/ip6_tunnel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index 10a693a..ae73164 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -171,7 +171,7 @@ static struct net_device_stats *ip6_get_stats(struct net_device *dev) } 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]); -- 1.8.3.1