drivers/net: use vzalloc()

[deliverable/linux.git] / drivers / net / bnx2.c

diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 062600be073b91b47a70b0d65edb8824b941c1f8..0de196da4d4a4d5f3906b24c61abe910ba1040e5 100644 (file)
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -766,13 +766,10 @@ bnx2_alloc_rx_mem(struct bnx2 *bp)
                int j;
 
                rxr->rx_buf_ring =
-                       vmalloc(SW_RXBD_RING_SIZE * bp->rx_max_ring);
+                       vzalloc(SW_RXBD_RING_SIZE * bp->rx_max_ring);
                if (rxr->rx_buf_ring == NULL)
                        return -ENOMEM;
 
-               memset(rxr->rx_buf_ring, 0,
-                      SW_RXBD_RING_SIZE * bp->rx_max_ring);
-
                for (j = 0; j < bp->rx_max_ring; j++) {
                        rxr->rx_desc_ring[j] =
                                dma_alloc_coherent(&bp->pdev->dev,
@@ -785,13 +782,11 @@ bnx2_alloc_rx_mem(struct bnx2 *bp)
                }
 
                if (bp->rx_pg_ring_size) {
-                       rxr->rx_pg_ring = vmalloc(SW_RXPG_RING_SIZE *
+                       rxr->rx_pg_ring = vzalloc(SW_RXPG_RING_SIZE *
                                                  bp->rx_max_pg_ring);
                        if (rxr->rx_pg_ring == NULL)
                                return -ENOMEM;
 
-                       memset(rxr->rx_pg_ring, 0, SW_RXPG_RING_SIZE *
-                              bp->rx_max_pg_ring);
                }
 
                for (j = 0; j < bp->rx_max_pg_ring; j++) {