kernel: bump 5.15 to 5.15.49

[openwrt/staging/ansuel.git] / target / linux / generic / backport-5.15 / 702-v5.19-17-net-ethernet-mtk_eth_soc-rely-on-GFP_KERNEL-for-dma_.patch

diff --git a/target/linux/generic/backport-5.15/702-v5.19-17-net-ethernet-mtk_eth_soc-rely-on-GFP_KERNEL-for-dma_.patch b/target/linux/generic/backport-5.15/702-v5.19-17-net-ethernet-mtk_eth_soc-rely-on-GFP_KERNEL-for-dma_.patch
index db4d9b34d3fc6cf3ee5407a9fe573da06b2ec55b..97677670cc1a5914bebb488e5e4776e9533a0a45 100644 (file)
--- a/target/linux/generic/backport-5.15/702-v5.19-17-net-ethernet-mtk_eth_soc-rely-on-GFP_KERNEL-for-dma_.patch
+++ b/target/linux/generic/backport-5.15/702-v5.19-17-net-ethernet-mtk_eth_soc-rely-on-GFP_KERNEL-for-dma_.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
-@@ -834,7 +834,7 @@ static int mtk_init_fq_dma(struct mtk_et
+@@ -845,7 +845,7 @@ static int mtk_init_fq_dma(struct mtk_et
        eth->scratch_ring = dma_alloc_coherent(eth->dma_dev,
                                               cnt * sizeof(struct mtk_tx_dma),
                                               &eth->phy_scratch_ring,
@@ -22,7 +22,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        if (unlikely(!eth->scratch_ring))
                return -ENOMEM;
  
-@@ -1609,7 +1609,7 @@ static int mtk_tx_alloc(struct mtk_eth *
+@@ -1623,7 +1623,7 @@ static int mtk_tx_alloc(struct mtk_eth *
                goto no_tx_mem;
  
        ring->dma = dma_alloc_coherent(eth->dma_dev, MTK_DMA_SIZE * sz,
@@ -31,7 +31,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        if (!ring->dma)
                goto no_tx_mem;
  
-@@ -1627,8 +1627,7 @@ static int mtk_tx_alloc(struct mtk_eth *
+@@ -1641,8 +1641,7 @@ static int mtk_tx_alloc(struct mtk_eth *
         */
        if (!MTK_HAS_CAPS(eth->soc->caps, MTK_QDMA)) {
                ring->dma_pdma = dma_alloc_coherent(eth->dma_dev, MTK_DMA_SIZE * sz,
@@ -41,7 +41,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                if (!ring->dma_pdma)
                        goto no_tx_mem;
  
-@@ -1740,7 +1739,7 @@ static int mtk_rx_alloc(struct mtk_eth *
+@@ -1757,7 +1756,7 @@ static int mtk_rx_alloc(struct mtk_eth *
  
        ring->dma = dma_alloc_coherent(eth->dma_dev,
                                       rx_dma_size * sizeof(*ring->dma),