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

Commit 08df5fa6 authored by Stefan Roese's avatar Stefan Roese Committed by David S. Miller
Browse files

net: ethernet: mediatek: Rename NEXT_RX_DESP_IDX to NEXT_DESP_IDX 



Rename the NEXT_RX_DESP_IDX macro to NEXT_DESP_IDX, so that it better
can be used for TX ops as well. This will be used in the upcoming
MT7628/88 support (same functionality for RX and TX in this macro).

Signed-off-by: default avatarStefan Roese <sr@denx.de>
Cc: René van Dorst <opensource@vdorst.com>
Cc: Daniel Golle <daniel@makrotopia.org>
Cc: Sean Wang <sean.wang@mediatek.com>
Cc: John Crispin <john@phrozen.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 45487403

drivers/net/ethernet/mediatek/mtk_eth_soc.c

+2 −2
Original line number Diff line number Diff line
@@ -903,7 +903,7 @@ static struct mtk_rx_ring *mtk_get_rx_ring(struct mtk_eth *eth) 


	for (i = 0; i < MTK_MAX_RX_RING_NUM; i++) {

		ring = &eth->rx_ring[i];

		idx = NEXT_RX_DESP_IDX(ring->calc_idx, ring->dma_size);

		idx = NEXT_DESP_IDX(ring->calc_idx, ring->dma_size);

		if (ring->dma[idx].rxd2 & RX_DMA_DONE) {

			ring->calc_idx_update = true;

			return ring;
@@ -952,7 +952,7 @@ static int mtk_poll_rx(struct napi_struct *napi, int budget, 
		if (unlikely(!ring))

			goto rx_done;



		idx = NEXT_RX_DESP_IDX(ring->calc_idx, ring->dma_size);

		idx = NEXT_DESP_IDX(ring->calc_idx, ring->dma_size);

		rxd = &ring->dma[idx];

		data = ring->data[idx];

drivers/net/ethernet/mediatek/mtk_eth_soc.h

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
				 NETIF_F_SG | NETIF_F_TSO | \

				 NETIF_F_TSO6 | \

				 NETIF_F_IPV6_CSUM)

#define NEXT_RX_DESP_IDX(X, Y)	(((X) + 1) & ((Y) - 1))

#define NEXT_DESP_IDX(X, Y)	(((X) + 1) & ((Y) - 1))



#define MTK_MAX_RX_RING_NUM	4

#define MTK_HW_LRO_DMA_SIZE	8