Commit 8ec91f5d authored by Roi Dayan's avatar Roi Dayan Committed by Saeed Mahameed
Browse files

net/mlx5: Lag, Remove duplicate code checking lag is supported 



Remove duplicate function for checking if device has lag support.

Signed-off-by: default avatarRoi Dayan <roid@nvidia.com>
Reviewed-by: default avatarShay Drory <shayd@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 690ad62f

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

+2 −2
Original line number Diff line number Diff line
@@ -2868,7 +2868,7 @@ void mlx5_esw_offloads_devcom_init(struct mlx5_eswitch *esw) 
	if (!MLX5_CAP_ESW(esw->dev, merged_eswitch))

		return;



	if (!mlx5_is_lag_supported(esw->dev))

	if (!mlx5_lag_is_supported(esw->dev))

		return;



	mlx5_devcom_register_component(devcom,
@@ -2890,7 +2890,7 @@ void mlx5_esw_offloads_devcom_cleanup(struct mlx5_eswitch *esw) 
	if (!MLX5_CAP_ESW(esw->dev, merged_eswitch))

		return;



	if (!mlx5_is_lag_supported(esw->dev))

	if (!mlx5_lag_is_supported(esw->dev))

		return;



	mlx5_devcom_send_event(devcom, MLX5_DEVCOM_ESW_OFFLOADS,

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

+11 −4
Original line number Diff line number Diff line
@@ -1268,14 +1268,21 @@ void mlx5_lag_remove_mdev(struct mlx5_core_dev *dev) 
	mlx5_ldev_put(ldev);

}



bool mlx5_lag_is_supported(struct mlx5_core_dev *dev)

{

	if (!MLX5_CAP_GEN(dev, vport_group_manager) ||

	    !MLX5_CAP_GEN(dev, lag_master) ||

	    MLX5_CAP_GEN(dev, num_lag_ports) < 2 ||

	    MLX5_CAP_GEN(dev, num_lag_ports) > MLX5_MAX_PORTS)

		return false;

	return true;

}



void mlx5_lag_add_mdev(struct mlx5_core_dev *dev)

{

	int err;



	if (!MLX5_CAP_GEN(dev, vport_group_manager) ||

	    !MLX5_CAP_GEN(dev, lag_master) ||

	    (MLX5_CAP_GEN(dev, num_lag_ports) > MLX5_MAX_PORTS ||

	     MLX5_CAP_GEN(dev, num_lag_ports) <= 1))

	if (!mlx5_lag_is_supported(dev))

		return;



recheck:

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

+1 −9
Original line number Diff line number Diff line
@@ -74,15 +74,7 @@ struct mlx5_lag { 
	struct lag_mpesw	  lag_mpesw;

};



static inline bool mlx5_is_lag_supported(struct mlx5_core_dev *dev)

{

	if (!MLX5_CAP_GEN(dev, vport_group_manager) ||

	    !MLX5_CAP_GEN(dev, lag_master) ||

	    MLX5_CAP_GEN(dev, num_lag_ports) < 2 ||

	    MLX5_CAP_GEN(dev, num_lag_ports) > MLX5_MAX_PORTS)

		return false;

	return true;

}

bool mlx5_lag_is_supported(struct mlx5_core_dev *dev);



static inline struct mlx5_lag *

mlx5_lag_dev(struct mlx5_core_dev *dev)