mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
92eb867873
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.60
Removed upstreamed:
generic/backport-6.6/409-mtd-spi-nor-winbond-fix-w25q128-regression.patch
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.60&id=27a58a19bd20a7afe369da2ce6d4ebea70768acd
Build system: x86/64
Build-tested: x86/64/AMD Cezanne, flogic/glinet_gl-mt6000, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3
Run-tested: x86/64/AMD Cezanne, flogic/glinet_gl-mt6000, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3
Signed-off-by: John Audia <therealgraysky@proton.me>
Link: https://github.com/openwrt/openwrt/pull/16892
Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 85844cfc5c)
30 lines
1.2 KiB
Diff
30 lines
1.2 KiB
Diff
From: Breno Leitao <leitao@debian.org>
|
|
Date: Wed, 28 Feb 2024 03:31:21 -0800
|
|
Subject: [PATCH] net: get stats64 if device if driver is configured
|
|
|
|
If the network driver is relying in the net core to do stats allocation,
|
|
then we want to dev_get_tstats64() instead of netdev_stats_to_stats64(),
|
|
since there are per-cpu stats that needs to be taken in consideration.
|
|
|
|
This will also simplify the drivers in regard to statistics. Once the
|
|
driver sets NETDEV_PCPU_STAT_TSTATS, it doesn't not need to allocate the
|
|
stacks, neither it needs to set `.ndo_get_stats64 = dev_get_tstats64`
|
|
for the generic stats collection function anymore.
|
|
|
|
Signed-off-by: Breno Leitao <leitao@debian.org>
|
|
Reviewed-by: Simon Horman <horms@kernel.org>
|
|
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
---
|
|
|
|
--- a/net/core/dev.c
|
|
+++ b/net/core/dev.c
|
|
@@ -10666,6 +10666,8 @@ struct rtnl_link_stats64 *dev_get_stats(
|
|
ops->ndo_get_stats64(dev, storage);
|
|
} else if (ops->ndo_get_stats) {
|
|
netdev_stats_to_stats64(storage, ops->ndo_get_stats(dev));
|
|
+ } else if (dev->pcpu_stat_type == NETDEV_PCPU_STAT_TSTATS) {
|
|
+ dev_get_tstats64(dev, storage);
|
|
} else {
|
|
netdev_stats_to_stats64(storage, &dev->stats);
|
|
}
|