mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-12-12 23:52:09 -05:00
b46655aaa0
removed upstreamed patches:
generic/backport-6.6/621-proc-fix-missing-pde_set_flags.patch [1]
generic/pending-6.6/742-net-ethernet-mtk_eth_soc-fix-tx-vlan-tag-for-llc-pac.patch [2]
manually rebase patches:
bcm27xx/patches-6.6/950-0518-net-macb-Also-set-DMA-coherent-mask.patch [3]
all other patches autorefreshed.
[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.105&id=698abcf08818cb7bafb978f4c9f6674d6a825d10
[2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.105&id=61b80fbdc0726317f72f9074e10126e0eb0e49c5
[3] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.105&id=5430388a81113e62a2d48b5d7dc1e76231908ebf
Signed-off-by: Goetz Goerisch <ggoerisch@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/20013
(cherry picked from commit 67c5ec7092)
Signed-off-by: Goetz Goerisch <ggoerisch@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/20036
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
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
|
|
@@ -18,7 +18,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
|
|
@@ -4580,6 +4580,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;
|
|
|
|
@@ -4592,6 +4593,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,
|