diff options
Diffstat (limited to 'drivers/net/ethernet/intel/e1000/e1000_ethtool.c')
| -rw-r--r-- | drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c index 2569a168334c..a41008523c98 100644 --- a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c +++ b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c | |||
| @@ -993,8 +993,8 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter) | |||
| 993 | 993 | ||
| 994 | txdr->size = txdr->count * sizeof(struct e1000_tx_desc); | 994 | txdr->size = txdr->count * sizeof(struct e1000_tx_desc); |
| 995 | txdr->size = ALIGN(txdr->size, 4096); | 995 | txdr->size = ALIGN(txdr->size, 4096); |
| 996 | txdr->desc = dma_zalloc_coherent(&pdev->dev, txdr->size, &txdr->dma, | 996 | txdr->desc = dma_alloc_coherent(&pdev->dev, txdr->size, &txdr->dma, |
| 997 | GFP_KERNEL); | 997 | GFP_KERNEL); |
| 998 | if (!txdr->desc) { | 998 | if (!txdr->desc) { |
| 999 | ret_val = 2; | 999 | ret_val = 2; |
| 1000 | goto err_nomem; | 1000 | goto err_nomem; |
| @@ -1051,8 +1051,8 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter) | |||
| 1051 | } | 1051 | } |
| 1052 | 1052 | ||
| 1053 | rxdr->size = rxdr->count * sizeof(struct e1000_rx_desc); | 1053 | rxdr->size = rxdr->count * sizeof(struct e1000_rx_desc); |
| 1054 | rxdr->desc = dma_zalloc_coherent(&pdev->dev, rxdr->size, &rxdr->dma, | 1054 | rxdr->desc = dma_alloc_coherent(&pdev->dev, rxdr->size, &rxdr->dma, |
| 1055 | GFP_KERNEL); | 1055 | GFP_KERNEL); |
| 1056 | if (!rxdr->desc) { | 1056 | if (!rxdr->desc) { |
| 1057 | ret_val = 6; | 1057 | ret_val = 6; |
| 1058 | goto err_nomem; | 1058 | goto err_nomem; |