diff options
| author |   Harini Katakam <harini.katakam@xilinx.com> | 2018-07-06 12:18:57 +0530 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-07-07 20:54:25 +0900 |
| commit | e50b770ea5c9eff0013e8ae714d20182ed50d5e6 (patch) | |
| tree | 2fff972b1cd6cdd5f8e12c319a38a4683ea306ee /drivers/net/ethernet/cadence/macb_main.c | |
| parent | net/smc: reduce sock_put() for fallback sockets (diff) | |
| download | linux-dev-e50b770ea5c9eff0013e8ae714d20182ed50d5e6.tar.xz linux-dev-e50b770ea5c9eff0013e8ae714d20182ed50d5e6.zip | |
net: macb: Free RX ring for all queues
rx ring is allocated for all queues in macb_alloc_consistent.
Free the same for all queues instead of just Q0.
Signed-off-by: Harini Katakam <harini.katakam@xilinx.com>
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/cadence/macb_main.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index 96cc03a6d942..2d5d0d110151 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -1812,13 +1812,7 @@ static void macb_free_consistent(struct macb *bp) struct macb_queue *queue; unsigned int q; - queue = &bp->queues[0]; bp->macbgem_ops.mog_free_rx_buffers(bp); - if (queue->rx_ring) { - dma_free_coherent(&bp->pdev->dev, RX_RING_BYTES(bp), - queue->rx_ring, queue->rx_ring_dma); - queue->rx_ring = NULL; - } for (q = 0, queue = bp->queues; q < bp->num_queues; ++q, ++queue) { kfree(queue->tx_skb); @@ -1828,6 +1822,11 @@ static void macb_free_consistent(struct macb *bp) queue->tx_ring, queue->tx_ring_dma); queue->tx_ring = NULL; } + if (queue->rx_ring) { + dma_free_coherent(&bp->pdev->dev, RX_RING_BYTES(bp), + queue->rx_ring, queue->rx_ring_dma); + queue->rx_ring = NULL; + } } } |