[openwrt/openwrt] kernel: Refresh generic patches

LEDE Commits lede-commits at lists.infradead.org
Wed Nov 2 16:26:08 PDT 2022


hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/e42ec112a44901f536d8ead638e7d31c03caf920

commit e42ec112a44901f536d8ead638e7d31c03caf920
Author: Hauke Mehrtens <hauke at hauke-m.de>
AuthorDate: Thu Nov 3 00:20:30 2022 +0100

    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 at hauke-m.de>
---
 ...731-net-ethernet-mediatek-ppe-add-support-for-flow-accou.patch | 8 ++++----
 1 file 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),




More information about the lede-commits mailing list