mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-19 13:48:06 +00:00
12f12df569
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.55 Added the following default ksym to target/linux/generic/config-6.6: CONFIG_PROC_MEM_ALWAYS_FORCE=y # CONFIG_PROC_MEM_FORCE_PTRACE is not set # CONFIG_PROC_MEM_NO_FORCE is not set Removed upstreamed: generic/backport-6.6/780-23-v6.12-r8169-Fix-spelling-mistake-tx_underun-tx_underrun.patch[1] generic/backport-6.6/780-25-v6.12-r8169-add-tally-counter-fields-added-with-RTL8125.patch[2] generic/pending-6.6/684-gso-fix-gso-fraglist-segmentation-after-pull-from-fr.patch[3] lantiq/patches-6.6/0025-v6.12-net-ethernet-lantiq_etop-fix-memory-disclosure.patch[4] Manually rebased: bcm27xx/patches-6.6/950-0086-Main-bcm2708-bcm2709-linux-port.patch bcm27xx/patches-6.6/950-0998-i2c-designware-Add-support-for-bus-clear-feature.patch All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.56&id=f02fcb7283b1c25f7e3ae07d7a2c830e06eb1a62 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.56&id=1c723d785adb711496bc64c24240f952f4faaabf 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.56&id=af3122f5fdc0d00581d6e598a668df6bf54c9daa 4. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.56&id=e66e38d07b31e177ca430758ed97fbc79f27d966 Build system: x86/64 Build-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Run-tested: x86/64/AMD Cezanne, 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/16655 Signed-off-by: Nick Hainke <vincent@systemli.org>
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
|
|
@@ -10662,6 +10662,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);
|
|
}
|