mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2025-09-18 12:29:52 +00:00
2c12942e5e
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.46 Removed upstreamed: backport-6.12/600-01-v6.14-net-dsa-add-hook-to-determine-whether-EEE-is-support.patch[1] generic-backport/600-02-v6.14-net-dsa-provide-implementation-of-.support_eee.patch[2] generic/backport-6.12/610-02-v6.14-net-dsa-b53-bcm_sf2-implement-.support_eee-method.patch[3] generic/backport-6.12/610-05-v6.16-net-dsa-b53-do-not-enable-EEE-on-bcm63xx.patch[4] generic/backport-6.12/621-proc-fix-missing-pde_set_flags.patch[5] generic/pending-6.12/742-net-ethernet-mtk_eth_soc-fix-tx-vlan-tag-for-llc-pac.patch[6] Manually rebased: bcm27xx/patches-6.12/950-0347-net-macb-Also-set-DMA-coherent-mask.patch All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.46&id=f7976772b16a7da725f9156c5ab6472ba22e3bc0 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.46&id=cda6c5c095e1997e63ed805ed3191f3d2af806a0 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.46&id=b765b9ee4e5a82e9d0e5d0649bf031e8a8b90b3d 4. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.46&id=3fbe3f4c57fda09f32e13fa05f53a0cc6f500619 5. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.46&id=3eebe856d09b6bdd8df99eb67203c831f23e21d7 6. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.46&id=f8b4b6f7c2bbfa33e50b8cc946c161172cdefbd5 Build system: x86/64 Build-tested: flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3, x86/64-glibc Run-tested: flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3, x86/64-glibc Signed-off-by: John Audia <therealgraysky@proton.me> Link: https://github.com/openwrt/openwrt/pull/20003 Signed-off-by: Robert Marko <robimarko@gmail.com>
44 lines
1.3 KiB
Diff
44 lines
1.3 KiB
Diff
From: Danila Romanov <pervokur@gmail.com>
|
|
Date: Wed, 22 Jan 2025 06:48:45 +0100
|
|
Subject: [PATCH] net: ethernet: mtk_eth_soc: do not enable page pool stats by
|
|
default
|
|
|
|
There is no reason for it to be enabled by default.
|
|
Align mtk_eth_soc driver to mt76 driver.
|
|
|
|
This option incurs additional CPU cost in allocation and recycle paths
|
|
and additional memory cost to store the statistics.
|
|
|
|
Signed-off-by: Danila Romanov <pervokur@gmail.com>
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
---
|
|
|
|
--- a/drivers/net/ethernet/mediatek/Kconfig
|
|
+++ b/drivers/net/ethernet/mediatek/Kconfig
|
|
@@ -26,7 +26,6 @@ config NET_MEDIATEK_SOC
|
|
select PHYLINK
|
|
select DIMLIB
|
|
select PAGE_POOL
|
|
- select PAGE_POOL_STATS
|
|
select PCS_MTK_LYNXI
|
|
select REGMAP_MMIO
|
|
help
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
@@ -4737,6 +4737,7 @@ static int mtk_get_sset_count(struct net
|
|
|
|
static void mtk_ethtool_pp_stats(struct mtk_eth *eth, u64 *data)
|
|
{
|
|
+#ifdef CONFIG_PAGE_POOL_STATS
|
|
struct page_pool_stats stats = {};
|
|
int i;
|
|
|
|
@@ -4749,6 +4750,7 @@ static void mtk_ethtool_pp_stats(struct
|
|
page_pool_get_stats(ring->page_pool, &stats);
|
|
}
|
|
page_pool_ethtool_stats_get(data, &stats);
|
|
+#endif
|
|
}
|
|
|
|
static void mtk_get_ethtool_stats(struct net_device *dev,
|