mirror of
https://github.com/openwrt/openwrt.git
synced 2026-06-17 14:50:15 +04:00
John Audia
b00d26376e
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.81
Removed upstreamed:
ramips/patches-6.12/100-mips-ralink-update-CPU-clock-index.patch[1]
airoha/patches-6.12/135-v7.1-net-airoha-Add-missing-cleanup-bits-in-airoha_qdma_c.patch[2]
Manually rebased:
airoha/patches-6.12/048-01-v6.15-net-airoha-Move-airoha_eth-driver-in-a-dedicated-fol.patch
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.81&id=e8fd60338545f4bc9c23d3d4686c88324aa76fb8
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.81&id=cce5027f9dc3a333ccbcd59a2c3ab2906bd08d30
Signed-off-by: John Audia <therealgraysky@proton.me>
Link: https://github.com/openwrt/openwrt/pull/22913
[Modify airoha move patch]
(cherry picked from commit 8d827ccc93)
Link: https://github.com/openwrt/openwrt/pull/23162
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
35 lines
1.4 KiB
Diff
35 lines
1.4 KiB
Diff
From 331f8a8bea22aecf99437f3561453a85f40026de Mon Sep 17 00:00:00 2001
|
|
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Mon, 13 Oct 2025 16:29:41 +0200
|
|
Subject: [PATCH] net: airoha: Add missing stats to ethtool_eth_mac_stats
|
|
|
|
Add the following stats to ethtool ethtool_eth_mac_stats stats:
|
|
- FramesTransmittedOK
|
|
- OctetsTransmittedOK
|
|
- FramesReceivedOK
|
|
- OctetsReceivedOK
|
|
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
|
|
Link: https://patch.msgid.link/20251013-airoha-ethtool-improvements-v1-1-fdd1c6fc9be1@kernel.org
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/ethernet/airoha/airoha_eth.c | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
--- a/drivers/net/ethernet/airoha/airoha_eth.c
|
|
+++ b/drivers/net/ethernet/airoha/airoha_eth.c
|
|
@@ -2043,8 +2043,12 @@ static void airoha_ethtool_get_mac_stats
|
|
airoha_update_hw_stats(port);
|
|
do {
|
|
start = u64_stats_fetch_begin(&port->stats.syncp);
|
|
+ stats->FramesTransmittedOK = port->stats.tx_ok_pkts;
|
|
+ stats->OctetsTransmittedOK = port->stats.tx_ok_bytes;
|
|
stats->MulticastFramesXmittedOK = port->stats.tx_multicast;
|
|
stats->BroadcastFramesXmittedOK = port->stats.tx_broadcast;
|
|
+ stats->FramesReceivedOK = port->stats.rx_ok_pkts;
|
|
+ stats->OctetsReceivedOK = port->stats.rx_ok_bytes;
|
|
stats->BroadcastFramesReceivedOK = port->stats.rx_broadcast;
|
|
} while (u64_stats_fetch_retry(&port->stats.syncp, start));
|
|
}
|