kernel: bump 6.1 to 6.1.42

[openwrt/openwrt.git] / target / linux / generic / pending-6.1 / 737-02-net-ethernet-mtk_eth_soc-move-MAX_DEVS-in-mtk_soc_da.patch

diff --git a/target/linux/generic/pending-6.1/737-02-net-ethernet-mtk_eth_soc-move-MAX_DEVS-in-mtk_soc_da.patch b/target/linux/generic/pending-6.1/737-02-net-ethernet-mtk_eth_soc-move-MAX_DEVS-in-mtk_soc_da.patch
index 82848a7c9724254b447c416a8e29d20a5c5efca7..e509663fa0ec12d13ae39c19c1821ff065ed5787 100644 (file)
--- a/target/linux/generic/pending-6.1/737-02-net-ethernet-mtk_eth_soc-move-MAX_DEVS-in-mtk_soc_da.patch
+++ b/target/linux/generic/pending-6.1/737-02-net-ethernet-mtk_eth_soc-move-MAX_DEVS-in-mtk_soc_da.patch
@@ -15,7 +15,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -4043,7 +4043,10 @@ static void mtk_sgmii_destroy(struct mtk
+@@ -4026,7 +4026,10 @@ static void mtk_sgmii_destroy(struct mtk
  {
        int i;
  
@@ -27,7 +27,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
                mtk_pcs_lynxi_destroy(eth->sgmii_pcs[i]);
  }
  
-@@ -4486,7 +4489,12 @@ static int mtk_sgmii_init(struct mtk_eth
+@@ -4479,7 +4482,12 @@ static int mtk_sgmii_init(struct mtk_eth
        u32 flags;
        int i;
  
@@ -41,7 +41,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
                np = of_parse_phandle(eth->dev->of_node, "mediatek,sgmiisys", i);
                if (!np)
                        break;
-@@ -4531,6 +4539,18 @@ static int mtk_probe(struct platform_dev
+@@ -4524,6 +4532,18 @@ static int mtk_probe(struct platform_dev
        if (MTK_HAS_CAPS(eth->soc->caps, MTK_SOC_MT7628))
                eth->ip_align = NET_IP_ALIGN;
  
@@ -60,7 +60,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
        spin_lock_init(&eth->page_lock);
        spin_lock_init(&eth->tx_irq_lock);
        spin_lock_init(&eth->rx_irq_lock);
-@@ -4716,7 +4736,7 @@ static int mtk_probe(struct platform_dev
+@@ -4709,7 +4729,7 @@ static int mtk_probe(struct platform_dev
                        goto err_deinit_ppe;
        }
  
@@ -69,7 +69,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
                if (!eth->netdev[i])
                        continue;
  
-@@ -4792,6 +4812,7 @@ static const struct mtk_soc_data mt2701_
+@@ -4785,6 +4805,7 @@ static const struct mtk_soc_data mt2701_
        .hw_features = MTK_HW_FEATURES,
        .required_clks = MT7623_CLKS_BITMAP,
        .required_pctl = true,
@@ -77,7 +77,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),
-@@ -4810,6 +4831,7 @@ static const struct mtk_soc_data mt7621_
+@@ -4803,6 +4824,7 @@ static const struct mtk_soc_data mt7621_
        .required_pctl = false,
        .offload_version = 1,
        .hash_offset = 2,
@@ -85,7 +85,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
        .foe_entry_size = sizeof(struct mtk_foe_entry) - 16,
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
-@@ -4831,6 +4853,7 @@ static const struct mtk_soc_data mt7622_
+@@ -4824,6 +4846,7 @@ static const struct mtk_soc_data mt7622_
        .offload_version = 2,
        .hash_offset = 2,
        .has_accounting = true,
@@ -93,7 +93,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
        .foe_entry_size = sizeof(struct mtk_foe_entry) - 16,
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
-@@ -4850,6 +4873,7 @@ static const struct mtk_soc_data mt7623_
+@@ -4843,6 +4866,7 @@ static const struct mtk_soc_data mt7623_
        .required_pctl = true,
        .offload_version = 1,
        .hash_offset = 2,
@@ -101,7 +101,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
        .foe_entry_size = sizeof(struct mtk_foe_entry) - 16,
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
-@@ -4869,6 +4893,7 @@ static const struct mtk_soc_data mt7629_
+@@ -4862,6 +4886,7 @@ static const struct mtk_soc_data mt7629_
        .required_clks = MT7629_CLKS_BITMAP,
        .required_pctl = false,
        .has_accounting = true,
@@ -109,7 +109,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),
-@@ -4890,6 +4915,7 @@ static const struct mtk_soc_data mt7981_
+@@ -4883,6 +4908,7 @@ static const struct mtk_soc_data mt7981_
        .hash_offset = 4,
        .foe_entry_size = sizeof(struct mtk_foe_entry),
        .has_accounting = true,
@@ -117,7 +117,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma_v2),
                .rxd_size = sizeof(struct mtk_rx_dma_v2),
-@@ -4908,6 +4934,7 @@ static const struct mtk_soc_data mt7986_
+@@ -4901,6 +4927,7 @@ static const struct mtk_soc_data mt7986_
        .required_clks = MT7986_CLKS_BITMAP,
        .required_pctl = false,
        .hash_offset = 4,
@@ -125,7 +125,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
        .foe_entry_size = sizeof(struct mtk_foe_entry),
        .has_accounting = true,
        .txrx = {
-@@ -4926,6 +4953,7 @@ static const struct mtk_soc_data rt5350_
+@@ -4919,6 +4946,7 @@ static const struct mtk_soc_data rt5350_
        .hw_features = MTK_HW_FEATURES_MT7628,
        .required_clks = MT7628_CLKS_BITMAP,
        .required_pctl = false,