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

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

drivers/net/ethernet/mellanox/mlx4/en_cq.c

+2 −5
Original line number Diff line number Diff line
@@ -53,13 +53,10 @@ int mlx4_en_create_cq(struct mlx4_en_priv *priv, 
	int err;



	cq = kzalloc_node(sizeof(*cq), GFP_KERNEL, node);

	if (!cq) {

		cq = kzalloc(sizeof(*cq), GFP_KERNEL);

	if (!cq) {

		en_err(priv, "Failed to allocate CQ structure\n");

		return -ENOMEM;

	}

	}



	cq->size = entries;

	cq->buf_size = cq->size * mdev->dev->caps.cqe_size;

drivers/net/ethernet/mellanox/mlx4/en_rx.c

+2 −5
Original line number Diff line number Diff line
@@ -270,13 +270,10 @@ int mlx4_en_create_rx_ring(struct mlx4_en_priv *priv, 
	int tmp;



	ring = kzalloc_node(sizeof(*ring), GFP_KERNEL, node);

	if (!ring) {

		ring = kzalloc(sizeof(*ring), GFP_KERNEL);

	if (!ring) {

		en_err(priv, "Failed to allocate RX ring structure\n");

		return -ENOMEM;

	}

	}



	ring->prod = 0;

	ring->cons = 0;

drivers/net/ethernet/mellanox/mlx4/en_tx.c

+2 −5
Original line number Diff line number Diff line
@@ -56,13 +56,10 @@ int mlx4_en_create_tx_ring(struct mlx4_en_priv *priv, 
	int err;



	ring = kzalloc_node(sizeof(*ring), GFP_KERNEL, node);

	if (!ring) {

		ring = kzalloc(sizeof(*ring), GFP_KERNEL);

	if (!ring) {

		en_err(priv, "Failed allocating TX ring\n");

		return -ENOMEM;

	}

	}



	ring->size = size;

	ring->size_mask = size - 1;

CRA Git | Maintained and supported by SUSTech CRA and CCSE