Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a766ccbf authored by Eli Cohen's avatar Eli Cohen Committed by Greg Kroah-Hartman
Browse files

net/mlx5e: E-Switch, Initialize eswitch only if eswitch manager 



[ Upstream commit 5f5991f36dce1e69dd8bd7495763eec2e28f08e7 ]

Execute mlx5_eswitch_init() only if we have MLX5_ESWITCH_MANAGER
capabilities.
Do the same for mlx5_eswitch_cleanup().

Fixes: a9f7705f ("net/mlx5: Unify vport manager capability check")
Signed-off-by: default avatarEli Cohen <eli@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e0638b6a

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

+2 −2
Original line number Diff line number Diff line
@@ -1616,7 +1616,7 @@ int mlx5_eswitch_init(struct mlx5_core_dev *dev) 
	int vport_num;

	int err;



	if (!MLX5_VPORT_MANAGER(dev))

	if (!MLX5_ESWITCH_MANAGER(dev))

		return 0;



	esw_info(dev,
@@ -1689,7 +1689,7 @@ int mlx5_eswitch_init(struct mlx5_core_dev *dev) 


void mlx5_eswitch_cleanup(struct mlx5_eswitch *esw)

{

	if (!esw || !MLX5_VPORT_MANAGER(esw->dev))

	if (!esw || !MLX5_ESWITCH_MANAGER(esw->dev))

		return;



	esw_info(esw->dev, "cleanup\n");