Commit 224169d2 authored by Tariq Toukan's avatar Tariq Toukan Committed by Jakub Kicinski
Browse files

net/mlx5e: IPsec, Remove unnecessary config flag usage 



MLX5_IPSEC_DEV() is always defined, no need to protect it under config
flag CONFIG_MLX5_EN_IPSEC, especially in slow path.

Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
Reviewed-by: default avatarRaed Salem <raeds@nvidia.com>
Reviewed-by: default avatarHuy Nguyen <huyn@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent a29adad5

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

+0 −2
Original line number Diff line number Diff line
@@ -2068,10 +2068,8 @@ static void mlx5e_build_rq_frags_info(struct mlx5_core_dev *mdev, 
	u32 buf_size = 0;

	int i;



#ifdef CONFIG_MLX5_EN_IPSEC

	if (MLX5_IPSEC_DEV(mdev))

		byte_count += MLX5E_METADATA_ETHER_LEN;

#endif



	if (mlx5e_rx_is_linear_skb(params, xsk)) {

		int frag_stride;

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

+0 −2
Original line number Diff line number Diff line
@@ -1786,12 +1786,10 @@ int mlx5e_rq_set_handlers(struct mlx5e_rq *rq, struct mlx5e_params *params, bool 
		rq->dealloc_wqe = mlx5e_dealloc_rx_mpwqe;



		rq->handle_rx_cqe = priv->profile->rx_handlers->handle_rx_cqe_mpwqe;

#ifdef CONFIG_MLX5_EN_IPSEC

		if (MLX5_IPSEC_DEV(mdev)) {

			netdev_err(netdev, "MPWQE RQ with IPSec offload not supported\n");

			return -EINVAL;

		}

#endif

		if (!rq->handle_rx_cqe) {

			netdev_err(netdev, "RX handler of MPWQE RQ is not set\n");

			return -EINVAL;