]> rtime.felk.cvut.cz Git - zynq/linux.git/commitdiff
net: macb: Free RX ring for all queues
authorHarini Katakam <harini.katakam@xilinx.com>
Fri, 6 Jul 2018 06:48:57 +0000 (12:18 +0530)
committerDavid S. Miller <davem@davemloft.net>
Sat, 7 Jul 2018 11:54:25 +0000 (20:54 +0900)
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>
drivers/net/ethernet/cadence/macb_main.c

index 96cc03a6d9420f52c7c871f52f32c8e9b8973bbb..2d5d0d1101512d4d8537cb8df929f226922abaf6 100644 (file)
@@ -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;
+               }
        }
 }