Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp4631633ybl; Wed, 22 Jan 2020 01:38:44 -0800 (PST) X-Google-Smtp-Source: APXvYqzvOlpcyMguQ/0QUzuT/7EUiQqCly3Xq63DCLxXcFHCkBd8Tn3fsMemHpxuxPSphAYjwl4Z X-Received: by 2002:a9d:1c95:: with SMTP id l21mr6585116ota.271.1579685924519; Wed, 22 Jan 2020 01:38:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579685924; cv=none; d=google.com; s=arc-20160816; b=ubhATxyx1UNeDJ9nKVYTZ/ktOpstfhiYGVF8L1hjIWE4j5WKqh/ILf0RvkD/Aq1Nwq E4Uj1aOIRcus7kCYQd2n/AgpfQpg7mhuBGs0ZU+5848gVxlcX/wAdzjuMmA9YvbZh/DU 7w6gzcUb1ocsFPVv//DB0mOBS+rM2YOxoVaj+1QR2uD4uIL4hL9Wr0xVuw4i0F5KdrzK fZwqfm6HMArqVBejJ9sxMCOhfULand6Z3qy4tRHLSSK5XCg3fVhgtRSynzrBFBwVHp8S 6Pl4OXzvMyaUTPtctiW3wZmXi8nVDRaeGMgWw8xy77ZknmuFUJL+Z3KWygRjK1vhRG4h yg+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=8t15Fxsq06j5sU9Tfos/Jqde5yWg0o1Q1GBCZfDRs4Q=; b=RN2MFPFj3WgjxNqVpQ1JdbwowZ/vTUUvH+Z2NL9MqjBfRTPXoo7nc8wzqrUhYuOrQ0 HG877w+WZmnwqbaGvgrfS1ZOZEzBZ9ML0fALEbM74XjsSxDCCcsgu7HKyCfyZ5Eoa9yK z4hngchRNgU16IhH3jdQibqeTAdUUqw0J6zVMafqrei2dwgLKcTVtAhujbcZlF9aRq5R 6OwVGXdmCvlhjU+vXZSV2v1AFTBODYs6SR3r33WUghqlEK1WVqGjusVWNHPCe3NkaMxy BeRhPxQ0/d5G6l6yWjYfGFfx7ttirqLw8waynIefpE+Lgnmiu2qy9QCXpxy6eRURb1Xg 1Lyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="K7ChVpj/"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q190si21163883oic.187.2020.01.22.01.38.32; Wed, 22 Jan 2020 01:38:44 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="K7ChVpj/"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730457AbgAVJgk (ORCPT + 99 others); Wed, 22 Jan 2020 04:36:40 -0500 Received: from mail.kernel.org ([198.145.29.99]:52142 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730654AbgAVJgh (ORCPT ); Wed, 22 Jan 2020 04:36:37 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 81D2B24125; Wed, 22 Jan 2020 09:36:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579685797; bh=9kg3hd95kbchqpnKiuH5WYSqpajo2NxVMIJ/HmbOcQ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K7ChVpj/4xdDS53ouG8EnlgtXh2t15e9hzfX/sxm5oPouehWWj3dR6apDzZ8ohOeJ hFSkJts5BXzY/vY/ZU/mZbaHK41WANmV/2ry0Vy6kUhYnoVS1vF/hjsmgTIQ+KYBZj nVHN/v7k8Dh3L50DFMIjQfhnMtcJq4vhNB634pUY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andrew Lunn , Alexander Lobakin , Florian Fainelli , "David S. Miller" Subject: [PATCH 4.9 82/97] net: dsa: tag_qca: fix doubled Tx statistics Date: Wed, 22 Jan 2020 10:29:26 +0100 Message-Id: <20200122092809.531667409@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200122092755.678349497@linuxfoundation.org> References: <20200122092755.678349497@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alexander Lobakin [ Upstream commit bd5874da57edd001b35cf28ae737779498c16a56 ] DSA subsystem takes care of netdev statistics since commit 4ed70ce9f01c ("net: dsa: Refactor transmit path to eliminate duplication"), so any accounting inside tagger callbacks is redundant and can lead to messing up the stats. This bug is present in Qualcomm tagger since day 0. Fixes: cafdc45c949b ("net-next: dsa: add Qualcomm tag RX/TX handler") Reviewed-by: Andrew Lunn Signed-off-by: Alexander Lobakin Reviewed-by: Florian Fainelli Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/dsa/tag_qca.c | 3 --- 1 file changed, 3 deletions(-) --- a/net/dsa/tag_qca.c +++ b/net/dsa/tag_qca.c @@ -40,9 +40,6 @@ static struct sk_buff *qca_tag_xmit(stru struct dsa_slave_priv *p = netdev_priv(dev); u16 *phdr, hdr; - dev->stats.tx_packets++; - dev->stats.tx_bytes += skb->len; - if (skb_cow_head(skb, 0) < 0) goto out_free;