drivers:net: dma_alloc_coherent: use __GFP_ZERO instead of memset(, 0)

[linux-2.6-block.git] / drivers / net / ethernet / intel / ixgb / ixgb_main.c

diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
index ea48083734359e52b229f592e84abf7654a82523..74464c34845476aa9b4dc6282a4a8f85838fafa8 100644 (file)
--- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c
+++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
@@ -717,14 +717,11 @@ ixgb_setup_tx_resources(struct ixgb_adapter *adapter)
        txdr->size = ALIGN(txdr->size, 4096);
 
        txdr->desc = dma_alloc_coherent(&pdev->dev, txdr->size, &txdr->dma,
-                                       GFP_KERNEL);
+                                       GFP_KERNEL | __GFP_ZERO);
        if (!txdr->desc) {
                vfree(txdr->buffer_info);
-               netif_err(adapter, probe, adapter->netdev,
-                         "Unable to allocate transmit descriptor memory\n");
                return -ENOMEM;
        }
-       memset(txdr->desc, 0, txdr->size);
 
        txdr->next_to_use = 0;
        txdr->next_to_clean = 0;
@@ -807,8 +804,6 @@ ixgb_setup_rx_resources(struct ixgb_adapter *adapter)
 
        if (!rxdr->desc) {
                vfree(rxdr->buffer_info);
-               netif_err(adapter, probe, adapter->netdev,
-                         "Unable to allocate receive descriptors\n");
                return -ENOMEM;
        }
        memset(rxdr->desc, 0, rxdr->size);