Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12c97c13 authored by John Crispin's avatar John Crispin Committed by David S. Miller
Browse files

net: mediatek: fix off by one in the TX ring allocation 



The TX ring setup has an off by one error causing it to not utilise all
descriptors. This has the side effect that we need to reset the next
pointer at runtime to make it work. Fix the off by one and remove the
code fixing the ring at runtime.

Signed-off-by: default avatarJohn Crispin <john@phrozen.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent eaadf9fd

drivers/net/ethernet/mediatek/mtk_eth_soc.c

+1 −2
Original line number Diff line number Diff line
@@ -926,7 +926,6 @@ static int mtk_poll_tx(struct mtk_eth *eth, int budget, bool *tx_again) 
		}

		mtk_tx_unmap(eth->dev, tx_buf);



		ring->last_free->txd2 = next_cpu;

		ring->last_free = desc;

		atomic_inc(&ring->free_count);
@@ -1032,7 +1031,7 @@ static int mtk_tx_alloc(struct mtk_eth *eth) 


	atomic_set(&ring->free_count, MTK_DMA_SIZE - 2);

	ring->next_free = &ring->dma[0];

	ring->last_free = &ring->dma[MTK_DMA_SIZE - 2];

	ring->last_free = &ring->dma[MTK_DMA_SIZE - 1];

	ring->thresh = MAX_SKB_FRAGS;



	/* make sure that all changes to the dma ring are flushed before we