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=-10.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=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 4CCD6C4724C for ; Thu, 30 Apr 2020 13:59:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2D51C20870 for ; Thu, 30 Apr 2020 13:59:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588255180; bh=JwRwvA9PcU1kqrQS88gZNGalhbtB/u/W4FKcJ/X3FsY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=kdHNXuo2qg0FSg7ICSlGrQPZcOO7BWEbXV9W2m9coX8RsT5v7RmLdwjNLG3nsVtFb OHTom/yER6CisIzqae8T+i4W4I4jEoSzIvit2s3de9KuhXd+Gnk4SiVk4zr9nokpQq HctzBwzAk6s4DahlTKFcnEw6RGm8kM464ihJZy1Y= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729356AbgD3N7h (ORCPT ); Thu, 30 Apr 2020 09:59:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:36922 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728974AbgD3Ny2 (ORCPT ); Thu, 30 Apr 2020 09:54:28 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (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 5AC642137B; Thu, 30 Apr 2020 13:54:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588254868; bh=JwRwvA9PcU1kqrQS88gZNGalhbtB/u/W4FKcJ/X3FsY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cvppIz907G7EO5tTkWJcW4ga4edZbTlMXIf5hv/rzm1SMF6Lic0bSMZPNxvK7wIn6 huMtilqSDcPHch/fTXUsEuNaGDb9PcNSTD+NgF2W8WVNte0eoUSbWN6ETMKJo/bwy4 dioasqT7cvQtvgcEP82PBEJb+KNXTwqDSu9xNsxQ= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Doug Berger , Florian Fainelli , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 23/27] net: bcmgenet: correct per TX/RX ring statistics Date: Thu, 30 Apr 2020 09:53:58 -0400 Message-Id: <20200430135402.20994-23-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200430135402.20994-1-sashal@kernel.org> References: <20200430135402.20994-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: Doug Berger [ Upstream commit a6d0b83f25073bdf08b8547aeff961a62c6ab229 ] The change to track net_device_stats per ring to better support SMP missed updating the rx_dropped member. The ndo_get_stats method is also needed to combine the results for ethtool statistics (-S) before filling in the ethtool structure. Fixes: 37a30b435b92 ("net: bcmgenet: Track per TX/RX rings statistics") Signed-off-by: Doug Berger Acked-by: Florian Fainelli Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c index 3e3044fe32066..4b3660c63b864 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -973,6 +973,8 @@ static void bcmgenet_get_ethtool_stats(struct net_device *dev, if (netif_running(dev)) bcmgenet_update_mib_counters(priv); + dev->netdev_ops->ndo_get_stats(dev); + for (i = 0; i < BCMGENET_STATS_LEN; i++) { const struct bcmgenet_stats *s; char *p; @@ -3215,6 +3217,7 @@ static struct net_device_stats *bcmgenet_get_stats(struct net_device *dev) dev->stats.rx_packets = rx_packets; dev->stats.rx_errors = rx_errors; dev->stats.rx_missed_errors = rx_errors; + dev->stats.rx_dropped = rx_dropped; return &dev->stats; } -- 2.20.1