diff options
| author |   Marcin Wojtas <mw@semihalf.com> | 2015-12-03 15:20:49 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-12-04 15:01:13 -0500 |
| commit | e864b4c7b184bde36fa6a02bb3190983d2f796f9 (patch) | |
| tree | ee769da432c32e72d92fabde28cb6a71bb36ff02 /drivers/net/ethernet/marvell/mvpp2.c | |
| parent | rhashtable: Prevent spurious EBUSY errors on insertion (diff) | |
| download | linux-dev-e864b4c7b184bde36fa6a02bb3190983d2f796f9.tar.xz linux-dev-e864b4c7b184bde36fa6a02bb3190983d2f796f9.zip | |
net: mvpp2: fix missing DMA region unmap in egress processing
The Tx descriptor release code currently calls dma_unmap_single() and
dev_kfree_skb_any() if the descriptor is associated with a non-NULL skb.
This condition is true only for the last fragment of the packet.
Since every descriptor's buffer is DMA-mapped it has to be properly
unmapped.
Signed-off-by: Marcin Wojtas <mw@semihalf.com>
Fixes: 3f518509dedc ("ethernet: Add new driver for Marvell Armada 375
network unit")
Cc: <stable@vger.kernel.org> # v3.18+
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/marvell/mvpp2.c')
| -rw-r--r-- | drivers/net/ethernet/marvell/mvpp2.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ethernet/marvell/mvpp2.c b/drivers/net/ethernet/marvell/mvpp2.c index d9884fd15b45..95db519d9901 100644 --- a/drivers/net/ethernet/marvell/mvpp2.c +++ b/drivers/net/ethernet/marvell/mvpp2.c @@ -4401,11 +4401,10 @@ static void mvpp2_txq_bufs_free(struct mvpp2_port *port, mvpp2_txq_inc_get(txq_pcpu); - if (!skb) - continue; - dma_unmap_single(port->dev->dev.parent, buf_phys_addr, skb_headlen(skb), DMA_TO_DEVICE); + if (!skb) + continue; dev_kfree_skb_any(skb); } } |