kernel: bump 5.10 to 5.10.210

[openwrt/openwrt.git] / target / linux / generic / backport-5.10 / 610-v5.13-32-net-ethernet-mtk_eth_soc-add-support-for-initializin.patch

diff --git a/target/linux/generic/backport-5.10/610-v5.13-32-net-ethernet-mtk_eth_soc-add-support-for-initializin.patch b/target/linux/generic/backport-5.10/610-v5.13-32-net-ethernet-mtk_eth_soc-add-support-for-initializin.patch
index e77530ba1f3556ae3ea653befb7caba38527d2f9..bececca21490d36340af78e5330900265adb785e 100644 (file)
--- a/target/linux/generic/backport-5.10/610-v5.13-32-net-ethernet-mtk_eth_soc-add-support-for-initializin.patch
+++ b/target/linux/generic/backport-5.10/610-v5.13-32-net-ethernet-mtk_eth_soc-add-support-for-initializin.patch
@@ -27,7 +27,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  obj-$(CONFIG_NET_MEDIATEK_STAR_EMAC) += mtk_star_emac.o
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -2303,7 +2303,10 @@ static int mtk_open(struct net_device *d
+@@ -2303,14 +2303,20 @@ static int mtk_open(struct net_device *d
  
        /* we run 2 netdevs on the same dma ring so we only bring it up once */
        if (!refcount_read(&eth->dma_refcnt)) {
@@ -37,9 +37,8 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
 +
 +              err = mtk_start_dma(eth);
  
-               if (err)
                if (err) {
-@@ -2311,7 +2314,10 @@ static int mtk_open(struct net_device *d
+                       phylink_disconnect_phy(mac->phylink);
                        return err;
                }
  
@@ -51,7 +50,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  
                napi_enable(&eth->tx_napi);
                napi_enable(&eth->rx_napi);
-@@ -2378,6 +2384,9 @@ static int mtk_stop(struct net_device *d
+@@ -2377,6 +2383,9 @@ static int mtk_stop(struct net_device *d
  
        mtk_dma_free(eth);
  
@@ -61,7 +60,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
        return 0;
  }
  
-@@ -3106,6 +3115,13 @@ static int mtk_probe(struct platform_dev
+@@ -3105,6 +3114,13 @@ static int mtk_probe(struct platform_dev
                        goto err_free_dev;
        }
  
@@ -75,7 +74,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
        for (i = 0; i < MTK_MAX_DEVS; i++) {
                if (!eth->netdev[i])
                        continue;
-@@ -3180,6 +3196,7 @@ static const struct mtk_soc_data mt7621_
+@@ -3179,6 +3195,7 @@ static const struct mtk_soc_data mt7621_
        .hw_features = MTK_HW_FEATURES,
        .required_clks = MT7621_CLKS_BITMAP,
        .required_pctl = false,
@@ -83,7 +82,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  };
  
  static const struct mtk_soc_data mt7622_data = {
-@@ -3188,6 +3205,7 @@ static const struct mtk_soc_data mt7622_
+@@ -3187,6 +3204,7 @@ static const struct mtk_soc_data mt7622_
        .hw_features = MTK_HW_FEATURES,
        .required_clks = MT7622_CLKS_BITMAP,
        .required_pctl = false,