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.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 B457FC76192 for ; Thu, 18 Jul 2019 03:13:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 883A720818 for ; Thu, 18 Jul 2019 03:13:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563419600; bh=F2P+Yuwxw/g0SuFWpPwa09atz9Iz1QQ2c+V6E8O1Jzk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=t7fiDvhFH69RyDpZHzOZAMTvztgfURiG8c2JHVKopl1c82b8Dsy9rwlV3JpZ/3HeH Z8JpEGVKEGdklwGwaUOy6CB8yz/WyihHYKLibg6sDIykFM/qoHIWr2VQ2wPzszr5KL LeV+rIYu0Ts47/Fe6+th9SojlVlyw2m2o3VJvjG0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391598AbfGRDNJ (ORCPT ); Wed, 17 Jul 2019 23:13:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:48106 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391597AbfGRDNJ (ORCPT ); Wed, 17 Jul 2019 23:13:09 -0400 Received: from localhost (115.42.148.210.bf.2iij.net [210.148.42.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4B85F205F4; Thu, 18 Jul 2019 03:13:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563419589; bh=F2P+Yuwxw/g0SuFWpPwa09atz9Iz1QQ2c+V6E8O1Jzk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=No83PIsAXoe5Kgsr5nJEzbFXyYroStJKqen+JOnXsFEpx+3P2LNmIKS4wA4ExAJc7 vOSULEyPpv+Lhx5RsSO/OBwnGgRLGCnxyEYnH0ddh9kV81fa0CnC8fF0Ttf4bSm41K C+d5wVbLGmcRc4Cs4prS+PwzFp+fuEirtMrPMs3k= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Xin Long , "David S. Miller" , Sasha Levin Subject: [PATCH 4.9 20/54] ip6_tunnel: allow not to count pkts on tstats by passing dev as NULL Date: Thu, 18 Jul 2019 12:01:50 +0900 Message-Id: <20190718030050.910095217@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190718030048.392549994@linuxfoundation.org> References: <20190718030048.392549994@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ 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 1b1cf33cbfb0..2b6abd046087 100644 --- a/include/net/ip6_tunnel.h +++ b/include/net/ip6_tunnel.h @@ -149,9 +149,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