net: mvneta: Fix missing DMA region unmap
authorEzequiel Garcia <ezequiel.garcia@free-electrons.com>
Fri, 30 May 2014 16:40:06 +0000 (13:40 -0300)
committerDavid S. Miller <davem@davemloft.net>
Mon, 2 Jun 2014 23:16:05 +0000 (16:16 -0700)
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 is true only for the last fragment of the packet.

This is wrong, however, since every descriptor buffer is DMA mapped and needs
to be unmapped.

Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/marvell/mvneta.c

index 57a2e76..f95e7ca 100644 (file)
@@ -1291,11 +1291,10 @@ static void mvneta_txq_bufs_free(struct mvneta_port *pp,
 
                mvneta_txq_inc_get(txq);
 
-               if (!skb)
-                       continue;
-
                dma_unmap_single(pp->dev->dev.parent, tx_desc->buf_phys_addr,
                                 tx_desc->data_size, DMA_TO_DEVICE);
+               if (!skb)
+                       continue;
                dev_kfree_skb_any(skb);
        }
 }