Commit 2f014f40 authored by Tariq Toukan's avatar Tariq Toukan Committed by Saeed Mahameed
Browse files

net/mlx5e: Remove non-essential TLS SQ state bit 



Maintaining an SQ state bit to indicate TLS support
has no real need, a simple and fast test [1] for the SKB is
almost equally good.

[1] !skb->sk || !tls_is_sk_tx_device_offloaded(skb->sk)

Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 392c36e5

drivers/net/ethernet/mellanox/mlx5/core/en.h

+0 −1
Original line number Diff line number Diff line
@@ -325,7 +325,6 @@ enum { 
	MLX5E_SQ_STATE_RECOVERING,

	MLX5E_SQ_STATE_IPSEC,

	MLX5E_SQ_STATE_AM,

	MLX5E_SQ_STATE_TLS,

	MLX5E_SQ_STATE_VLAN_NEED_L2_INLINE,

	MLX5E_SQ_STATE_PENDING_XSK_TX,

};

drivers/net/ethernet/mellanox/mlx5/core/en_accel/en_accel.h

+3 −5
Original line number Diff line number Diff line
@@ -123,11 +123,9 @@ static inline bool mlx5e_accel_tx_begin(struct net_device *dev, 
		mlx5e_udp_gso_handle_tx_skb(skb);



#ifdef CONFIG_MLX5_EN_TLS

	if (test_bit(MLX5E_SQ_STATE_TLS, &sq->state)) {

	/* May send SKBs and WQEs. */

	if (unlikely(!mlx5e_tls_handle_tx_skb(dev, sq, skb, &state->tls)))

		return false;

	}

#endif



#ifdef CONFIG_MLX5_EN_IPSEC

drivers/net/ethernet/mellanox/mlx5/core/en_main.c

+0 −2
Original line number Diff line number Diff line
@@ -1134,8 +1134,6 @@ static int mlx5e_alloc_txqsq(struct mlx5e_channel *c, 
		set_bit(MLX5E_SQ_STATE_VLAN_NEED_L2_INLINE, &sq->state);

	if (MLX5_IPSEC_DEV(c->priv->mdev))

		set_bit(MLX5E_SQ_STATE_IPSEC, &sq->state);

	if (mlx5_accel_is_tls_device(c->priv->mdev))

		set_bit(MLX5E_SQ_STATE_TLS, &sq->state);

	if (param->is_mpw)

		set_bit(MLX5E_SQ_STATE_MPWQE, &sq->state);

	sq->stop_room = param->stop_room;