diff options
Diffstat (limited to 'drivers/net/ethernet/broadcom/bcm63xx_enet.c')
-rw-r--r-- | drivers/net/ethernet/broadcom/bcm63xx_enet.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c index 6bae973d4dce..09cd188826b1 100644 --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c | |||
@@ -936,7 +936,7 @@ static int bcm_enet_open(struct net_device *dev) | |||
936 | 936 | ||
937 | /* allocate rx dma ring */ | 937 | /* allocate rx dma ring */ |
938 | size = priv->rx_ring_size * sizeof(struct bcm_enet_desc); | 938 | size = priv->rx_ring_size * sizeof(struct bcm_enet_desc); |
939 | p = dma_zalloc_coherent(kdev, size, &priv->rx_desc_dma, GFP_KERNEL); | 939 | p = dma_alloc_coherent(kdev, size, &priv->rx_desc_dma, GFP_KERNEL); |
940 | if (!p) { | 940 | if (!p) { |
941 | ret = -ENOMEM; | 941 | ret = -ENOMEM; |
942 | goto out_freeirq_tx; | 942 | goto out_freeirq_tx; |
@@ -947,7 +947,7 @@ static int bcm_enet_open(struct net_device *dev) | |||
947 | 947 | ||
948 | /* allocate tx dma ring */ | 948 | /* allocate tx dma ring */ |
949 | size = priv->tx_ring_size * sizeof(struct bcm_enet_desc); | 949 | size = priv->tx_ring_size * sizeof(struct bcm_enet_desc); |
950 | p = dma_zalloc_coherent(kdev, size, &priv->tx_desc_dma, GFP_KERNEL); | 950 | p = dma_alloc_coherent(kdev, size, &priv->tx_desc_dma, GFP_KERNEL); |
951 | if (!p) { | 951 | if (!p) { |
952 | ret = -ENOMEM; | 952 | ret = -ENOMEM; |
953 | goto out_free_rx_ring; | 953 | goto out_free_rx_ring; |
@@ -2120,7 +2120,7 @@ static int bcm_enetsw_open(struct net_device *dev) | |||
2120 | 2120 | ||
2121 | /* allocate rx dma ring */ | 2121 | /* allocate rx dma ring */ |
2122 | size = priv->rx_ring_size * sizeof(struct bcm_enet_desc); | 2122 | size = priv->rx_ring_size * sizeof(struct bcm_enet_desc); |
2123 | p = dma_zalloc_coherent(kdev, size, &priv->rx_desc_dma, GFP_KERNEL); | 2123 | p = dma_alloc_coherent(kdev, size, &priv->rx_desc_dma, GFP_KERNEL); |
2124 | if (!p) { | 2124 | if (!p) { |
2125 | dev_err(kdev, "cannot allocate rx ring %u\n", size); | 2125 | dev_err(kdev, "cannot allocate rx ring %u\n", size); |
2126 | ret = -ENOMEM; | 2126 | ret = -ENOMEM; |
@@ -2132,7 +2132,7 @@ static int bcm_enetsw_open(struct net_device *dev) | |||
2132 | 2132 | ||
2133 | /* allocate tx dma ring */ | 2133 | /* allocate tx dma ring */ |
2134 | size = priv->tx_ring_size * sizeof(struct bcm_enet_desc); | 2134 | size = priv->tx_ring_size * sizeof(struct bcm_enet_desc); |
2135 | p = dma_zalloc_coherent(kdev, size, &priv->tx_desc_dma, GFP_KERNEL); | 2135 | p = dma_alloc_coherent(kdev, size, &priv->tx_desc_dma, GFP_KERNEL); |
2136 | if (!p) { | 2136 | if (!p) { |
2137 | dev_err(kdev, "cannot allocate tx ring\n"); | 2137 | dev_err(kdev, "cannot allocate tx ring\n"); |
2138 | ret = -ENOMEM; | 2138 | ret = -ENOMEM; |