net/mlx5: Fix LAG requirement when CONFIG_MLX5_ESWITCH is off (a6491744) · Commits · 戴 / test

If CONFIG_MLX5_ESWITCH is not defined, test for SR-IOV being disabled, instead of calling e-switch LAG prereq routine. Since LAG with SRIOV is allowed only when switchdev mode is on. Fixes: ("net/mlx5: Allow/disallow LAG according to pre-req only") Signed-off-by:

Aviv Heller <avivh@mellanox.com> Signed-off-by:

Saeed Mahameed <saeedm@mellanox.com>

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

+8 −5

Original line number	Diff line number	Diff line
		@@ -291,12 +291,15 @@ static int mlx5_deactivate_lag(struct mlx5_lag *ldev)

		static bool mlx5_lag_check_prereq(struct mlx5_lag *ldev)
		{
		if (ldev->pf[0].dev &&
		ldev->pf[1].dev &&
		mlx5_esw_lag_prereq(ldev->pf[0].dev, ldev->pf[1].dev))
		return true;
		else
		if (!ldev->pf[0].dev \|\| !ldev->pf[1].dev)
		return false;

		#ifdef CONFIG_MLX5_ESWITCH
		return mlx5_esw_lag_prereq(ldev->pf[0].dev, ldev->pf[1].dev);
		#else
		return (!mlx5_sriov_is_enabled(ldev->pf[0].dev) &&
		!mlx5_sriov_is_enabled(ldev->pf[1].dev));
		#endif
		}

		static void mlx5_lag_add_ib_devices(struct mlx5_lag *ldev)

Admin message