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

Commit b926260c authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by David S. Miller
Browse files

net: mv643xx_eth: Avoid unmapping the TSO header buffers 



The buffers for the TSO headers belong to a DMA coherent region which is
allocated at ndo_open() time, and released at ndo_stop() time.

Therefore, and contrary to the TSO payload descriptor buffers, the TSO header
buffers don't need to be unmapped. This commit adds a check to detect a
TSO header buffer and explicitly prevent the unmap.

Signed-off-by: default avatarEzequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent eee492ea

drivers/net/ethernet/marvell/mv643xx_eth.c

+6 −2
Original line number Diff line number Diff line
@@ -189,6 +189,9 @@ static char mv643xx_eth_driver_version[] = "1.4"; 
#define MV643XX_MAX_TSO_SEGS 100

#define MV643XX_MAX_SKB_DESCS (MV643XX_MAX_TSO_SEGS * 2 + MAX_SKB_FRAGS)



#define IS_TSO_HEADER(txq, addr) \

	((addr >= txq->tso_hdrs_dma) && \

	 (addr < txq->tso_hdrs_dma + txq->tx_ring_size * TSO_HEADER_SIZE))

/*

 * RX/TX descriptors.

 */
@@ -1072,6 +1075,7 @@ static int txq_reclaim(struct tx_queue *txq, int budget, int force) 
			mp->dev->stats.tx_errors++;

		}



		if (!IS_TSO_HEADER(txq, desc->buf_ptr))

			dma_unmap_single(mp->dev->dev.parent, desc->buf_ptr,

					 desc->byte_cnt, DMA_TO_DEVICE);

		dev_kfree_skb(skb);