Commit 35f31ff0 authored by Eric Dumazet's avatar Eric Dumazet Committed by Jakub Kicinski
Browse files

net/mlx4: rename two constants 



MAX_DESC_SIZE is really the size of the bounce buffer used
when reaching the right side of TX ring buffer.

MAX_DESC_TXBBS get a MLX4_ prefix.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent ddda6326

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

+6 −4
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ int mlx4_en_create_tx_ring(struct mlx4_en_priv *priv, 
	ring->size = size;

	ring->size_mask = size - 1;

	ring->sp_stride = stride;

	ring->full_size = ring->size - HEADROOM - MAX_DESC_TXBBS;

	ring->full_size = ring->size - HEADROOM - MLX4_MAX_DESC_TXBBS;



	tmp = size * sizeof(struct mlx4_en_tx_info);

	ring->tx_info = kvmalloc_node(tmp, GFP_KERNEL, node);
@@ -77,9 +77,11 @@ int mlx4_en_create_tx_ring(struct mlx4_en_priv *priv, 
	en_dbg(DRV, priv, "Allocated tx_info ring at addr:%p size:%d\n",

		 ring->tx_info, tmp);



	ring->bounce_buf = kmalloc_node(MAX_DESC_SIZE, GFP_KERNEL, node);

	ring->bounce_buf = kmalloc_node(MLX4_TX_BOUNCE_BUFFER_SIZE,

					GFP_KERNEL, node);

	if (!ring->bounce_buf) {

		ring->bounce_buf = kmalloc(MAX_DESC_SIZE, GFP_KERNEL);

		ring->bounce_buf = kmalloc(MLX4_TX_BOUNCE_BUFFER_SIZE,

					   GFP_KERNEL);

		if (!ring->bounce_buf) {

			err = -ENOMEM;

			goto err_info;
@@ -909,7 +911,7 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev) 
	/* Align descriptor to TXBB size */

	desc_size = ALIGN(real_size, TXBB_SIZE);

	nr_txbb = desc_size >> LOG_TXBB_SIZE;

	if (unlikely(nr_txbb > MAX_DESC_TXBBS)) {

	if (unlikely(nr_txbb > MLX4_MAX_DESC_TXBBS)) {

		if (netif_msg_tx_err(priv))

			en_warn(priv, "Oversized header or SG list\n");

		goto tx_drop_count;

drivers/net/ethernet/mellanox/mlx4/mlx4_en.h

+2 −2
Original line number Diff line number Diff line
@@ -90,8 +90,8 @@ 
#define MLX4_EN_FILTER_EXPIRY_QUOTA 60



/* Typical TSO descriptor with 16 gather entries is 352 bytes... */

#define MAX_DESC_SIZE		512

#define MAX_DESC_TXBBS		(MAX_DESC_SIZE / TXBB_SIZE)

#define MLX4_TX_BOUNCE_BUFFER_SIZE 512

#define MLX4_MAX_DESC_TXBBS	   (MLX4_TX_BOUNCE_BUFFER_SIZE / TXBB_SIZE)



/*

 * OS related constants and tunables