aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2022-11-03 00:20:30 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2022-11-03 00:25:34 +0100
commite42ec112a44901f536d8ead638e7d31c03caf920 (patch)
treea0d6315de088105064138a9198f607eeb9c1423b /target/linux/generic
parentc3322cf04a1b9ee826dcc56944750b6bbcb716ef (diff)
downloadupstream-e42ec112a44901f536d8ead638e7d31c03caf920.tar.gz
upstream-e42ec112a44901f536d8ead638e7d31c03caf920.tar.bz2
upstream-e42ec112a44901f536d8ead638e7d31c03caf920.zip
kernel: Refresh generic patches
This patch was out of sync. Fixes: 1673b7dca384 ("kernel: backport fixes for MediaTek Ethernet driver") Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic')
-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 815e0d2337..8bf036d006 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
-@@ -4084,7 +4084,9 @@ static int mtk_probe(struct platform_dev
+@@ -4088,7 +4088,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;
-@@ -4204,6 +4206,7 @@ static const struct mtk_soc_data mt7622_
+@@ -4211,6 +4213,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),
-@@ -4241,6 +4244,7 @@ static const struct mtk_soc_data mt7629_
+@@ -4248,6 +4251,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),
-@@ -4261,6 +4265,7 @@ static const struct mtk_soc_data mt7986_
+@@ -4268,6 +4272,7 @@ static const struct mtk_soc_data mt7986_
.offload_version = 2,
.hash_offset = 4,
.foe_entry_size = sizeof(struct mtk_foe_entry),