kernel: bump 5.4 to 5.4.58

[openwrt/staging/rmilecki.git] / target / linux / ramips / patches-5.4 / 0400-net-ethernet-mediatek-use-napi_consume_skb.patch

diff --git a/target/linux/ramips/patches-5.4/0400-net-ethernet-mediatek-use-napi_consume_skb.patch b/target/linux/ramips/patches-5.4/0400-net-ethernet-mediatek-use-napi_consume_skb.patch
index 1ccb85d4b4344dd0b749471f1a08f3af7082adae..a31100642b07b4c626a0a735bfa8c805e9b107a8 100644 (file)
--- a/target/linux/ramips/patches-5.4/0400-net-ethernet-mediatek-use-napi_consume_skb.patch
+++ b/target/linux/ramips/patches-5.4/0400-net-ethernet-mediatek-use-napi_consume_skb.patch
@@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -844,7 +844,8 @@ static int txd_to_idx(struct mtk_tx_ring
+@@ -853,7 +853,8 @@ static int txd_to_idx(struct mtk_tx_ring
        return ((void *)dma - (void *)ring->dma) / sizeof(*dma);
  }
  
@@ -19,7 +19,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  {
        if (MTK_HAS_CAPS(eth->soc->caps, MTK_QDMA)) {
                if (tx_buf->flags & MTK_TX_FLAGS_SINGLE0) {
-@@ -876,8 +877,12 @@ static void mtk_tx_unmap(struct mtk_eth
+@@ -885,8 +886,12 @@ static void mtk_tx_unmap(struct mtk_eth
  
        tx_buf->flags = 0;
        if (tx_buf->skb &&
@@ -34,7 +34,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        tx_buf->skb = NULL;
  }
  
-@@ -1055,7 +1060,7 @@ err_dma:
+@@ -1064,7 +1069,7 @@ err_dma:
                tx_buf = mtk_desc_to_tx_buf(ring, itxd);
  
                /* unmap dma */
@@ -43,7 +43,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
                itxd->txd3 = TX_DMA_LS0 | TX_DMA_OWNER_CPU;
                if (!MTK_HAS_CAPS(eth->soc->caps, MTK_QDMA))
-@@ -1373,7 +1378,7 @@ static int mtk_poll_tx_qdma(struct mtk_e
+@@ -1382,7 +1387,7 @@ static int mtk_poll_tx_qdma(struct mtk_e
                        done[mac]++;
                        budget--;
                }
@@ -52,7 +52,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
                ring->last_free = desc;
                atomic_inc(&ring->free_count);
-@@ -1410,7 +1415,7 @@ static int mtk_poll_tx_pdma(struct mtk_e
+@@ -1419,7 +1424,7 @@ static int mtk_poll_tx_pdma(struct mtk_e
                        budget--;
                }
  
@@ -61,7 +61,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
                desc = &ring->dma[cpu];
                ring->last_free = desc;
-@@ -1612,7 +1617,7 @@ static void mtk_tx_clean(struct mtk_eth
+@@ -1621,7 +1626,7 @@ static void mtk_tx_clean(struct mtk_eth
  
        if (ring->buf) {
                for (i = 0; i < MTK_DMA_SIZE; i++)