diff options
Diffstat (limited to 'drivers/net/bnx2.c')
-rw-r--r-- | drivers/net/bnx2.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index 062600be073b..0de196da4d4a 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c | |||
@@ -766,13 +766,10 @@ bnx2_alloc_rx_mem(struct bnx2 *bp) | |||
766 | int j; | 766 | int j; |
767 | 767 | ||
768 | rxr->rx_buf_ring = | 768 | rxr->rx_buf_ring = |
769 | vmalloc(SW_RXBD_RING_SIZE * bp->rx_max_ring); | 769 | vzalloc(SW_RXBD_RING_SIZE * bp->rx_max_ring); |
770 | if (rxr->rx_buf_ring == NULL) | 770 | if (rxr->rx_buf_ring == NULL) |
771 | return -ENOMEM; | 771 | return -ENOMEM; |
772 | 772 | ||
773 | memset(rxr->rx_buf_ring, 0, | ||
774 | SW_RXBD_RING_SIZE * bp->rx_max_ring); | ||
775 | |||
776 | for (j = 0; j < bp->rx_max_ring; j++) { | 773 | for (j = 0; j < bp->rx_max_ring; j++) { |
777 | rxr->rx_desc_ring[j] = | 774 | rxr->rx_desc_ring[j] = |
778 | dma_alloc_coherent(&bp->pdev->dev, | 775 | dma_alloc_coherent(&bp->pdev->dev, |
@@ -785,13 +782,11 @@ bnx2_alloc_rx_mem(struct bnx2 *bp) | |||
785 | } | 782 | } |
786 | 783 | ||
787 | if (bp->rx_pg_ring_size) { | 784 | if (bp->rx_pg_ring_size) { |
788 | rxr->rx_pg_ring = vmalloc(SW_RXPG_RING_SIZE * | 785 | rxr->rx_pg_ring = vzalloc(SW_RXPG_RING_SIZE * |
789 | bp->rx_max_pg_ring); | 786 | bp->rx_max_pg_ring); |
790 | if (rxr->rx_pg_ring == NULL) | 787 | if (rxr->rx_pg_ring == NULL) |
791 | return -ENOMEM; | 788 | return -ENOMEM; |
792 | 789 | ||
793 | memset(rxr->rx_pg_ring, 0, SW_RXPG_RING_SIZE * | ||
794 | bp->rx_max_pg_ring); | ||
795 | } | 790 | } |
796 | 791 | ||
797 | for (j = 0; j < bp->rx_max_pg_ring; j++) { | 792 | for (j = 0; j < bp->rx_max_pg_ring; j++) { |