Commit 4beaacc6 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller

net/mlx4_en: remove fallback after kzalloc_node()

kzalloc_node(..., GFP_KERNEL, node) will attempt to allocate
memory as close as possible to the node.

There is no need to fallback to kzalloc() if this has failed.
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Cc: Tariq Toukan <tariqt@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c03b0358
...@@ -54,11 +54,8 @@ int mlx4_en_create_cq(struct mlx4_en_priv *priv, ...@@ -54,11 +54,8 @@ int mlx4_en_create_cq(struct mlx4_en_priv *priv,
cq = kzalloc_node(sizeof(*cq), GFP_KERNEL, node); cq = kzalloc_node(sizeof(*cq), GFP_KERNEL, node);
if (!cq) { if (!cq) {
cq = kzalloc(sizeof(*cq), GFP_KERNEL); en_err(priv, "Failed to allocate CQ structure\n");
if (!cq) { return -ENOMEM;
en_err(priv, "Failed to allocate CQ structure\n");
return -ENOMEM;
}
} }
cq->size = entries; cq->size = entries;
......
...@@ -271,11 +271,8 @@ int mlx4_en_create_rx_ring(struct mlx4_en_priv *priv, ...@@ -271,11 +271,8 @@ int mlx4_en_create_rx_ring(struct mlx4_en_priv *priv,
ring = kzalloc_node(sizeof(*ring), GFP_KERNEL, node); ring = kzalloc_node(sizeof(*ring), GFP_KERNEL, node);
if (!ring) { if (!ring) {
ring = kzalloc(sizeof(*ring), GFP_KERNEL); en_err(priv, "Failed to allocate RX ring structure\n");
if (!ring) { return -ENOMEM;
en_err(priv, "Failed to allocate RX ring structure\n");
return -ENOMEM;
}
} }
ring->prod = 0; ring->prod = 0;
......
...@@ -57,11 +57,8 @@ int mlx4_en_create_tx_ring(struct mlx4_en_priv *priv, ...@@ -57,11 +57,8 @@ int mlx4_en_create_tx_ring(struct mlx4_en_priv *priv,
ring = kzalloc_node(sizeof(*ring), GFP_KERNEL, node); ring = kzalloc_node(sizeof(*ring), GFP_KERNEL, node);
if (!ring) { if (!ring) {
ring = kzalloc(sizeof(*ring), GFP_KERNEL); en_err(priv, "Failed allocating TX ring\n");
if (!ring) { return -ENOMEM;
en_err(priv, "Failed allocating TX ring\n");
return -ENOMEM;
}
} }
ring->size = size; ring->size = size;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment