kernel: backport ethtool_puts

[openwrt/openwrt.git] / target / linux / generic / backport-5.15 / 702-v5.19-23-net-ethernet-mtk_eth_soc-add-rxd_size-to-mtk_soc_dat.patch

diff --git a/target/linux/generic/backport-5.15/702-v5.19-23-net-ethernet-mtk_eth_soc-add-rxd_size-to-mtk_soc_dat.patch b/target/linux/generic/backport-5.15/702-v5.19-23-net-ethernet-mtk_eth_soc-add-rxd_size-to-mtk_soc_dat.patch
index 5436e92dbeaa8a92280a223a81445981480017d7..525882c956b2df853e1cf9d95a5703744bcfb1c6 100644 (file)
--- a/target/linux/generic/backport-5.15/702-v5.19-23-net-ethernet-mtk_eth_soc-add-rxd_size-to-mtk_soc_dat.patch
+++ b/target/linux/generic/backport-5.15/702-v5.19-23-net-ethernet-mtk_eth_soc-add-rxd_size-to-mtk_soc_dat.patch
@@ -13,7 +13,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -1775,7 +1775,7 @@ static int mtk_rx_alloc(struct mtk_eth *
+@@ -1776,7 +1776,7 @@ static int mtk_rx_alloc(struct mtk_eth *
        }
  
        ring->dma = dma_alloc_coherent(eth->dma_dev,
@@ -22,7 +22,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                                       &ring->phys, GFP_KERNEL);
        if (!ring->dma)
                return -ENOMEM;
-@@ -1833,9 +1833,8 @@ static void mtk_rx_clean(struct mtk_eth
+@@ -1834,9 +1834,8 @@ static void mtk_rx_clean(struct mtk_eth
  
        if (ring->dma) {
                dma_free_coherent(eth->dma_dev,
@@ -34,7 +34,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                ring->dma = NULL;
        }
  }
-@@ -3405,6 +3404,7 @@ static const struct mtk_soc_data mt2701_
+@@ -3402,6 +3401,7 @@ static const struct mtk_soc_data mt2701_
        .required_pctl = true,
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
@@ -42,7 +42,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        },
  };
  
-@@ -3416,6 +3416,7 @@ static const struct mtk_soc_data mt7621_
+@@ -3413,6 +3413,7 @@ static const struct mtk_soc_data mt7621_
        .offload_version = 2,
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
@@ -50,7 +50,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        },
  };
  
-@@ -3428,6 +3429,7 @@ static const struct mtk_soc_data mt7622_
+@@ -3425,6 +3426,7 @@ static const struct mtk_soc_data mt7622_
        .offload_version = 2,
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
@@ -58,7 +58,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        },
  };
  
-@@ -3439,6 +3441,7 @@ static const struct mtk_soc_data mt7623_
+@@ -3436,6 +3438,7 @@ static const struct mtk_soc_data mt7623_
        .offload_version = 2,
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
@@ -66,7 +66,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        },
  };
  
-@@ -3450,6 +3453,7 @@ static const struct mtk_soc_data mt7629_
+@@ -3447,6 +3450,7 @@ static const struct mtk_soc_data mt7629_
        .required_pctl = false,
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
@@ -74,7 +74,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        },
  };
  
-@@ -3460,6 +3464,7 @@ static const struct mtk_soc_data rt5350_
+@@ -3457,6 +3461,7 @@ static const struct mtk_soc_data rt5350_
        .required_pctl = false,
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
@@ -84,7 +84,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
-@@ -864,6 +864,7 @@ struct mtk_tx_dma_desc_info {
+@@ -865,6 +865,7 @@ struct mtk_tx_dma_desc_info {
   * @required_pctl             A bool value to show whether the SoC requires
   *                            the extra setup for those pins used by GMAC.
   * @txd_size                  Tx DMA descriptor size.
@@ -92,7 +92,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
   */
  struct mtk_soc_data {
        u32             ana_rgc3;
-@@ -874,6 +875,7 @@ struct mtk_soc_data {
+@@ -875,6 +876,7 @@ struct mtk_soc_data {
        netdev_features_t hw_features;
        struct {
                u32     txd_size;