kernel: backport ethtool_puts

[openwrt/openwrt.git] / target / linux / generic / backport-5.15 / 713-v6.0-net-ethernet-mtk_eth_soc-move-gdma_to_ppe-and-ppe_ba.patch

diff --git a/target/linux/generic/backport-5.15/713-v6.0-net-ethernet-mtk_eth_soc-move-gdma_to_ppe-and-ppe_ba.patch b/target/linux/generic/backport-5.15/713-v6.0-net-ethernet-mtk_eth_soc-move-gdma_to_ppe-and-ppe_ba.patch
index 008e20416dcda25851089292a24f4cfbf8fdc56d..66e2778709dd3062b662d8a4dbb023d395d0e3d8 100644 (file)
--- a/target/linux/generic/backport-5.15/713-v6.0-net-ethernet-mtk_eth_soc-move-gdma_to_ppe-and-ppe_ba.patch
+++ b/target/linux/generic/backport-5.15/713-v6.0-net-ethernet-mtk_eth_soc-move-gdma_to_ppe-and-ppe_ba.patch
@@ -57,7 +57,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
  };
  
  /* strings used by ethtool */
-@@ -2924,6 +2928,7 @@ static int mtk_open(struct net_device *d
+@@ -2928,6 +2932,7 @@ 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)) {
@@ -65,9 +65,9 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
                u32 gdm_config = MTK_GDMA_TO_PDMA;
                int err;
  
-@@ -2931,15 +2936,15 @@ static int mtk_open(struct net_device *d
-               if (err)
+@@ -2937,15 +2942,15 @@ static int mtk_open(struct net_device *d
                        return err;
+               }
  
 -              if (eth->soc->offload_version && mtk_ppe_start(eth->ppe) == 0)
 -                      gdm_config = MTK_GDMA_TO_PPE;
@@ -84,7 +84,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
                refcount_set(&eth->dma_refcnt, 1);
        }
        else
-@@ -4045,7 +4050,9 @@ static int mtk_probe(struct platform_dev
+@@ -4044,7 +4049,9 @@ static int mtk_probe(struct platform_dev
        }
  
        if (eth->soc->offload_version) {
@@ -105,7 +105,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
  #define MTK_GDMA_DROP_ALL       0x7777
  
  /* Unicast Filter MAC Address Register - Low */
-@@ -952,6 +951,8 @@ struct mtk_reg_map {
+@@ -953,6 +952,8 @@ struct mtk_reg_map {
                u32     fq_blen;        /* fq free page buffer length */
        } qdma;
        u32     gdm1_cnt;