aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.15/731-net-ethernet-mediatek-ppe-add-support-for-flow-accou.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2023-03-04 19:11:37 +0100
committerFelix Fietkau <nbd@nbd.name>2023-03-05 08:51:22 +0100
commitdaaf708b8c433cfedc7860eab30a9e585490b3c6 (patch)
treed885a4ee7dea6d35502ae0f4cc2fed1c251abe77 /target/linux/generic/pending-5.15/731-net-ethernet-mediatek-ppe-add-support-for-flow-accou.patch
parent5ef783c1b26bef0b6cdbf44401ff6fb487e4d2f5 (diff)
downloadupstream-daaf708b8c433cfedc7860eab30a9e585490b3c6.tar.gz
upstream-daaf708b8c433cfedc7860eab30a9e585490b3c6.tar.bz2
upstream-daaf708b8c433cfedc7860eab30a9e585490b3c6.zip
kernel: backport upstream mtk_eth_soc fixes
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux/generic/pending-5.15/731-net-ethernet-mediatek-ppe-add-support-for-flow-accou.patch')
-rw-r--r--target/linux/generic/pending-5.15/731-net-ethernet-mediatek-ppe-add-support-for-flow-accou.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/pending-5.15/731-net-ethernet-mediatek-ppe-add-support-for-flow-accou.patch b/target/linux/generic/pending-5.15/731-net-ethernet-mediatek-ppe-add-support-for-flow-accou.patch
index 36e3f01e54..9c169fe357 100644
--- a/target/linux/generic/pending-5.15/731-net-ethernet-mediatek-ppe-add-support-for-flow-accou.patch
+++ b/target/linux/generic/pending-5.15/731-net-ethernet-mediatek-ppe-add-support-for-flow-accou.patch
@@ -53,7 +53,7 @@ v2: fix wrong variable name in return value check spotted by Denis Kirjanov
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -4582,7 +4582,9 @@ static int mtk_probe(struct platform_dev
+@@ -4586,7 +4586,9 @@ static int mtk_probe(struct platform_dev
u32 ppe_addr = eth->soc->reg_map->ppe_base + i * 0x400;
eth->ppe[i] = mtk_ppe_init(eth, eth->base + ppe_addr,
@@ -64,7 +64,7 @@ v2: fix wrong variable name in return value check spotted by Denis Kirjanov
if (!eth->ppe[i]) {
err = -ENOMEM;
goto err_free_dev;
-@@ -4707,6 +4709,7 @@ static const struct mtk_soc_data mt7622_
+@@ -4711,6 +4713,7 @@ static const struct mtk_soc_data mt7622_
.required_pctl = false,
.offload_version = 2,
.hash_offset = 2,
@@ -72,7 +72,7 @@ v2: fix wrong variable name in return value check spotted by Denis Kirjanov
.foe_entry_size = sizeof(struct mtk_foe_entry) - 16,
.txrx = {
.txd_size = sizeof(struct mtk_tx_dma),
-@@ -4744,6 +4747,7 @@ static const struct mtk_soc_data mt7629_
+@@ -4748,6 +4751,7 @@ static const struct mtk_soc_data mt7629_
.hw_features = MTK_HW_FEATURES,
.required_clks = MT7629_CLKS_BITMAP,
.required_pctl = false,
@@ -80,7 +80,7 @@ v2: fix wrong variable name in return value check spotted by Denis Kirjanov
.txrx = {
.txd_size = sizeof(struct mtk_tx_dma),
.rxd_size = sizeof(struct mtk_rx_dma),
-@@ -4764,6 +4768,7 @@ static const struct mtk_soc_data mt7986_
+@@ -4768,6 +4772,7 @@ static const struct mtk_soc_data mt7986_
.offload_version = 2,
.hash_offset = 4,
.foe_entry_size = sizeof(struct mtk_foe_entry),