From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Sven Auhagen <sven.auhagen@voleatech.de>,
"David S . Miller" <davem@davemloft.net>,
Sasha Levin <sashal@kernel.org>,
netdev@vger.kernel.org
Subject: [PATCH AUTOSEL 5.4 11/24] mvpp2: ethtool rxtx stats fix
Date: Tue, 23 Jun 2020 13:35:46 -0400 [thread overview]
Message-ID: <20200623173559.1355728-11-sashal@kernel.org> (raw)
In-Reply-To: <20200623173559.1355728-1-sashal@kernel.org>
From: Sven Auhagen <sven.auhagen@voleatech.de>
[ Upstream commit cc970925feb9a38c2f0d34305518e00a3084ce85 ]
The ethtool rx and tx queue statistics are reporting wrong values.
Fix reading out the correct ones.
Signed-off-by: Sven Auhagen <sven.auhagen@voleatech.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
index 373b8c8328501..ae40880f216bc 100644
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
@@ -1541,7 +1541,7 @@ static void mvpp2_read_stats(struct mvpp2_port *port)
for (q = 0; q < port->ntxqs; q++)
for (i = 0; i < ARRAY_SIZE(mvpp2_ethtool_txq_regs); i++)
*pstats++ += mvpp2_read_index(port->priv,
- MVPP22_CTRS_TX_CTR(port->id, i),
+ MVPP22_CTRS_TX_CTR(port->id, q),
mvpp2_ethtool_txq_regs[i].offset);
/* Rxqs are numbered from 0 from the user standpoint, but not from the
@@ -1550,7 +1550,7 @@ static void mvpp2_read_stats(struct mvpp2_port *port)
for (q = 0; q < port->nrxqs; q++)
for (i = 0; i < ARRAY_SIZE(mvpp2_ethtool_rxq_regs); i++)
*pstats++ += mvpp2_read_index(port->priv,
- port->first_rxq + i,
+ port->first_rxq + q,
mvpp2_ethtool_rxq_regs[i].offset);
}
--
2.25.1
next prev parent reply other threads:[~2020-06-23 17:39 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-23 17:35 [PATCH AUTOSEL 5.4 01/24] sata_rcar: handle pm_runtime_get_sync failure cases Sasha Levin
2020-06-23 17:35 ` [PATCH AUTOSEL 5.4 02/24] ata/libata: Fix usage of page address by page_address in ata_scsi_mode_select_xlat function Sasha Levin
2020-06-23 17:35 ` [PATCH AUTOSEL 5.4 03/24] drm/amd/display: Use kfree() to free rgb_user in calculate_user_regamma_ramp() Sasha Levin
2020-06-23 17:35 ` [PATCH AUTOSEL 5.4 04/24] riscv/atomic: Fix sign extension for RV64I Sasha Levin
2020-06-23 17:35 ` [PATCH AUTOSEL 5.4 05/24] hwrng: ks-sa - Fix runtime PM imbalance on error Sasha Levin
2020-06-23 17:35 ` [PATCH AUTOSEL 5.4 06/24] arm64/sve: Eliminate data races on sve_default_vl Sasha Levin
2020-06-23 17:35 ` [PATCH AUTOSEL 5.4 07/24] ibmvnic: Harden device login requests Sasha Levin
2020-06-23 17:35 ` [PATCH AUTOSEL 5.4 08/24] net: alx: fix race condition in alx_remove Sasha Levin
2020-06-23 17:35 ` [PATCH AUTOSEL 5.4 09/24] test_objagg: Fix potential memory leak in error handling Sasha Levin
2020-06-23 17:35 ` [PATCH AUTOSEL 5.4 10/24] rocker: fix incorrect error handling in dma_rings_init Sasha Levin
2020-06-23 17:35 ` Sasha Levin [this message]
2020-06-23 17:35 ` [PATCH AUTOSEL 5.4 12/24] pinctrl: qcom: spmi-gpio: fix warning about irq chip reusage Sasha Levin
2020-06-23 17:35 ` [PATCH AUTOSEL 5.4 13/24] pinctrl: tegra: Use noirq suspend/resume callbacks Sasha Levin
2020-06-23 17:35 ` [PATCH AUTOSEL 5.4 14/24] s390/ptrace: pass invalid syscall numbers to tracing Sasha Levin
2020-06-23 17:35 ` [PATCH AUTOSEL 5.4 15/24] s390/ptrace: fix setting syscall number Sasha Levin
2020-06-23 17:35 ` [PATCH AUTOSEL 5.4 16/24] s390/vdso: Use $(LD) instead of $(CC) to link vDSO Sasha Levin
2020-06-23 17:35 ` [PATCH AUTOSEL 5.4 17/24] s390/vdso: fix vDSO clock_getres() Sasha Levin
2020-06-23 17:35 ` [PATCH AUTOSEL 5.4 18/24] arm64: sve: Fix build failure when ARM64_SVE=y and SYSCTL=n Sasha Levin
2020-06-23 17:35 ` [PATCH AUTOSEL 5.4 19/24] kbuild: improve cc-option to clean up all temporary files Sasha Levin
2020-06-23 17:35 ` [PATCH AUTOSEL 5.4 20/24] recordmcount: support >64k sections Sasha Levin
2020-06-23 17:35 ` [PATCH AUTOSEL 5.4 21/24] kprobes: Suppress the suspicious RCU warning on kprobes Sasha Levin
2020-06-23 17:35 ` [PATCH AUTOSEL 5.4 22/24] blktrace: break out of blktrace setup on concurrent calls Sasha Levin
2020-06-23 17:35 ` [PATCH AUTOSEL 5.4 23/24] block: update hctx map when use multiple maps Sasha Levin
2020-06-23 17:35 ` [PATCH AUTOSEL 5.4 24/24] RISC-V: Don't allow write+exec only page mapping request in mmap Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200623173559.1355728-11-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=sven.auhagen@voleatech.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox