diff options
| author |   Ezequiel Garcia <ezequiel.garcia@free-electrons.com> | 2014-05-30 13:40:11 -0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-06-02 16:16:06 -0700 |
| commit | b926260c05517478a53cc029035c8eb2d8ca2715 (patch) | |
| tree | 3734718e8bd9af893e2de3c0e1d90c6eec49377d /drivers/net/ethernet/marvell/mv643xx_eth.c | |
| parent | net: mv643xx_eth: Drop the NETDEV_TX_BUSY return path (diff) | |
| download | linux-dev-b926260c05517478a53cc029035c8eb2d8ca2715.tar.xz linux-dev-b926260c05517478a53cc029035c8eb2d8ca2715.zip | |
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: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/marvell/mv643xx_eth.c')
| -rw-r--r-- | drivers/net/ethernet/marvell/mv643xx_eth.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c index 88afbe0435d7..b151a949f352 100644 --- a/drivers/net/ethernet/marvell/mv643xx_eth.c +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c @@ -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,8 +1075,9 @@ static int txq_reclaim(struct tx_queue *txq, int budget, int force) mp->dev->stats.tx_errors++; } - dma_unmap_single(mp->dev->dev.parent, desc->buf_ptr, - desc->byte_cnt, DMA_TO_DEVICE); + 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); } |