kernel: bump 5.15 to 5.15.103

[openwrt/staging/hauke.git] / target / linux / generic / backport-5.15 / 702-v5.19-18-net-ethernet-mtk_eth_soc-move-tx-dma-desc-configurat.patch

diff --git a/target/linux/generic/backport-5.15/702-v5.19-18-net-ethernet-mtk_eth_soc-move-tx-dma-desc-configurat.patch b/target/linux/generic/backport-5.15/702-v5.19-18-net-ethernet-mtk_eth_soc-move-tx-dma-desc-configurat.patch
index 95f122f730f7246d6acc26195a801d6490e1d316..8e16ea2556695cbcf856564f3b331b50343ef7d7 100644 (file)
--- a/target/linux/generic/backport-5.15/702-v5.19-18-net-ethernet-mtk_eth_soc-move-tx-dma-desc-configurat.patch
+++ b/target/linux/generic/backport-5.15/702-v5.19-18-net-ethernet-mtk_eth_soc-move-tx-dma-desc-configurat.patch
@@ -14,7 +14,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
-@@ -971,18 +971,51 @@ static void setup_tx_buf(struct mtk_eth
+@@ -972,18 +972,51 @@ static void setup_tx_buf(struct mtk_eth
        }
  }
  
@@ -69,7 +69,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        int k = 0;
  
        itxd = ring->next_free;
-@@ -990,49 +1023,32 @@ static int mtk_tx_map(struct sk_buff *sk
+@@ -991,49 +1024,32 @@ static int mtk_tx_map(struct sk_buff *sk
        if (itxd == ring->last_free)
                return -ENOMEM;
  
@@ -126,7 +126,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                        bool new_desc = true;
  
                        if (MTK_HAS_CAPS(eth->soc->caps, MTK_QDMA) ||
-@@ -1047,23 +1063,17 @@ static int mtk_tx_map(struct sk_buff *sk
+@@ -1048,23 +1064,17 @@ static int mtk_tx_map(struct sk_buff *sk
                                new_desc = false;
                        }
  
@@ -159,7 +159,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
                        tx_buf = mtk_desc_to_tx_buf(ring, txd);
                        if (new_desc)
-@@ -1073,20 +1083,17 @@ static int mtk_tx_map(struct sk_buff *sk
+@@ -1074,20 +1084,17 @@ static int mtk_tx_map(struct sk_buff *sk
                        tx_buf->flags |= (!mac->id) ? MTK_TX_FLAGS_FPORT0 :
                                         MTK_TX_FLAGS_FPORT1;
  
@@ -186,7 +186,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                        txd_pdma->txd2 |= TX_DMA_LS0;
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
-@@ -842,6 +842,17 @@ enum mkt_eth_capabilities {
+@@ -843,6 +843,17 @@ enum mkt_eth_capabilities {
                      MTK_MUX_U3_GMAC2_TO_QPHY | \
                      MTK_MUX_GMAC12_TO_GEPHY_SGMII | MTK_QDMA)