Commit 0e706f79 authored by Eric Dumazet's avatar Eric Dumazet Committed by Jakub Kicinski
Browse files

net/mlx4: small optimization in mlx4_en_xmit() 



Test against MLX4_MAX_DESC_TXBBS only matters if the TX
bounce buffer is going to be used.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Cc: Wei Wang <weiwan@google.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 26782aad

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

+5 −5
Original line number Diff line number Diff line
@@ -911,11 +911,6 @@ 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 > MLX4_MAX_DESC_TXBBS)) {

		if (netif_msg_tx_err(priv))

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

		goto tx_drop_count;

	}



	bf_ok = ring->bf_enabled;

	if (skb_vlan_tag_present(skb)) {
@@ -943,6 +938,11 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev) 
	if (likely(index + nr_txbb <= ring->size))

		tx_desc = ring->buf + (index << LOG_TXBB_SIZE);

	else {

		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;

		}

		tx_desc = (struct mlx4_en_tx_desc *) ring->bounce_buf;

		bounce = true;

		bf_ok = false;