--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -1610,8 +1610,10 @@ static int mtk_napi_rx(struct napi_struc
+@@ -1625,8 +1625,10 @@ static int mtk_napi_rx(struct napi_struc
static int mtk_tx_alloc(struct mtk_eth *eth)
{
ring->buf = kcalloc(MTK_DMA_SIZE, sizeof(*ring->buf),
GFP_KERNEL);
-@@ -1627,8 +1629,10 @@ static int mtk_tx_alloc(struct mtk_eth *
+@@ -1642,8 +1644,10 @@ static int mtk_tx_alloc(struct mtk_eth *
int next = (i + 1) % MTK_DMA_SIZE;
u32 next_ptr = ring->phys + next * sz;
}
/* On MT7688 (PDMA only) this driver uses the ring->dma structs
-@@ -1650,7 +1654,7 @@ static int mtk_tx_alloc(struct mtk_eth *
+@@ -1665,7 +1669,7 @@ static int mtk_tx_alloc(struct mtk_eth *
ring->dma_size = MTK_DMA_SIZE;
atomic_set(&ring->free_count, MTK_DMA_SIZE - 2);
ring->next_free = &ring->dma[0];
ring->last_free_ptr = (u32)(ring->phys + ((MTK_DMA_SIZE - 1) * sz));
ring->thresh = MAX_SKB_FRAGS;
-@@ -1683,6 +1687,7 @@ no_tx_mem:
+@@ -1698,6 +1702,7 @@ no_tx_mem:
static void mtk_tx_clean(struct mtk_eth *eth)
{
struct mtk_tx_ring *ring = ð->tx_ring;
int i;
-@@ -1695,17 +1700,15 @@ static void mtk_tx_clean(struct mtk_eth
+@@ -1710,17 +1715,15 @@ static void mtk_tx_clean(struct mtk_eth
if (ring->dma) {
dma_free_coherent(eth->dma_dev,