From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CF107C48BD6 for ; Thu, 27 Jun 2019 00:41:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9CB5621852 for ; Thu, 27 Jun 2019 00:41:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561596072; bh=SJ47HIqX8vXHLwXiUOPdZh63aIIRBbI2v3uAx8PDNj4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=l4u7/gGyPg5WH1T42jOkkFuaFOJM3ra1YgPMHCJ+mXoyhH1O+JwIBOoFMzcPX2xP4 ylZe/eN8xMnQyC/RYENA+yobTbSRb+rUmCSAx0jJc+k6AfQdAAGeuFMYnidAC3xUt4 T9L4Mks52nLGQNlASXLnexgiTikMBCHFe3SsGseQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728853AbfF0AlL (ORCPT ); Wed, 26 Jun 2019 20:41:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:45024 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727521AbfF0AlK (ORCPT ); Wed, 26 Jun 2019 20:41:10 -0400 Received: from sasha-vm.mshome.net (unknown [107.242.116.147]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id F07C021852; Thu, 27 Jun 2019 00:41:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561596069; bh=SJ47HIqX8vXHLwXiUOPdZh63aIIRBbI2v3uAx8PDNj4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YrItidelH3KuVzgTwsX+ylYJIyJbl9GQ6bK90yFnTRd7JzRnwDJyaF7p5m338cTMD MmDBwEUbu4oE3S2JKwywQ99fbohSZY6i9xkSXChIw6OsXLMH3zVln1NiCjcKZKGjcp 3JtVstWri3c+BgXsNso6x2jc5YY9jhL/DBce1K94= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Xin Long , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 31/35] ip6_tunnel: allow not to count pkts on tstats by passing dev as NULL Date: Wed, 26 Jun 2019 20:39:19 -0400 Message-Id: <20190627003925.21330-31-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190627003925.21330-1-sashal@kernel.org> References: <20190627003925.21330-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Xin Long [ Upstream commit 6f6a8622057c92408930c31698394fae1557b188 ] A similar fix to Patch "ip_tunnel: allow not to count pkts on tstats by setting skb's dev to NULL" is also needed by ip6_tunnel. Signed-off-by: Xin Long Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- include/net/ip6_tunnel.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/include/net/ip6_tunnel.h b/include/net/ip6_tunnel.h index d66f70f63734..3b0e3cdee1c3 100644 --- a/include/net/ip6_tunnel.h +++ b/include/net/ip6_tunnel.h @@ -152,9 +152,12 @@ static inline void ip6tunnel_xmit(struct sock *sk, struct sk_buff *skb, memset(skb->cb, 0, sizeof(struct inet6_skb_parm)); pkt_len = skb->len - skb_inner_network_offset(skb); err = ip6_local_out(dev_net(skb_dst(skb)->dev), sk, skb); - if (unlikely(net_xmit_eval(err))) - pkt_len = -1; - iptunnel_xmit_stats(dev, pkt_len); + + if (dev) { + if (unlikely(net_xmit_eval(err))) + pkt_len = -1; + iptunnel_xmit_stats(dev, pkt_len); + } } #endif #endif -- 2.20.1