Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp4633216ybl; Wed, 22 Jan 2020 01:40:57 -0800 (PST) X-Google-Smtp-Source: APXvYqz2V+b9rs5VGA34qF75t4tkIYrF8jKURcCCoo08V7DUtRRhlOJztARDYV3licIt9tjvJXoO X-Received: by 2002:a9d:5545:: with SMTP id h5mr7037759oti.296.1579686057404; Wed, 22 Jan 2020 01:40:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579686057; cv=none; d=google.com; s=arc-20160816; b=NWQVQfJ8yRw6j1EomXTFv461E/x79oUeCh7+6ieZFwSD3gzkfrrTqE/9baifNPSOOv BMlsLJGB/dLiIwFN1QV/3Wt69E5UI1cwul8f3N5pnQG9cEPVe7+PKMueiKNvYqwm9Pdt 9pzTtd2M5O34J94ElvSHQ/QqvRjZ1VEXJBt7rHah0Ng3eJNevUo+G8YH0SfwFWEhpQZs I/1oCJVkWfpfqYmmkH1++y+kTZW7l5hgRdPDrvzZ/gb8EerQnmZ991jcXl8sX6hssOek tZxjOSFdiTMlIQAkliXYnZXVCY07Gya/lBPx3WMZBf2eV1DEtQdmJAGcfgi2HO1w6WP+ eQdQ== 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=Yh34CAmf2d0JxRGPau37NBGOJ+i7fk9zBA8iTe21aM8=; b=qraNTUz2Z5PmHevuvaLcBwvYmc49F05XvNyoEo7DNDFViNljkdWX5+YBi9W2KKbR4t GLrbaqmvJznKOJcIKHKMkzlDF2mHRKkOpGIOHZuKAKpl6GP5vb8yo6aoa4KuwC1BLbDt m1jZYaD846JqLVPWB63cSvUuPRBlCCcyoYXHQ0mUrxVcqvIFltu4jLTR30XAPhxe83hR 6T0KPoYZO8aavq8VE7Ub8K/Kq9ChtE/aERcRnRM9xYP50SKs5eKzY6PDUhmCyIPXHTHG Ru/e1Wk9Xpq+mHlh5SQWwNknj5tlVrMDi7r0tEYGKzFpx1tYuVcTr9PPPdMdybYhNAtx lB6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=jCuv0Vlv; 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 m4si23533608otr.122.2020.01.22.01.40.45; Wed, 22 Jan 2020 01:40:57 -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=jCuv0Vlv; 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 S1731330AbgAVJi7 (ORCPT + 99 others); Wed, 22 Jan 2020 04:38:59 -0500 Received: from mail.kernel.org ([198.145.29.99]:56130 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732769AbgAVJi4 (ORCPT ); Wed, 22 Jan 2020 04:38:56 -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 C2C242467E; Wed, 22 Jan 2020 09:38:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579685936; bh=jlwuOc04JQ/mlkGK+K25zV2RTSgLEUG02HcCGOeRKdg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jCuv0VlvHhIASNl8ARt17H5ojjbeNXbWaoPPsafE7PqsCqpUCXd907E2vE7KcDOUw 1rf6030EttarspBFD6V5yJxZKe6IlGJ0Q/ZUW/xVcfJFmMTX3cOIlTCSTzZAuLZtHo xVyTCOI0092MBwJuyd0MPbG4HZFruevsbxMIE9Z0= 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.14 43/65] net: dsa: tag_qca: fix doubled Tx statistics Date: Wed, 22 Jan 2020 10:29:28 +0100 Message-Id: <20200122092757.188372831@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200122092750.976732974@linuxfoundation.org> References: <20200122092750.976732974@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 @@ -41,9 +41,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) return NULL;