Commit 97bd788e authored by Jiri Pirko's avatar Jiri Pirko Committed by Saeed Mahameed
Browse files

net/mlx5: Skip inline mode check after mlx5_eswitch_enable_locked() failure 



Commit bffaa916 ("net/mlx5: E-Switch, Add control for inline mode")
added inline mode checking to esw_offloads_start() with a warning
printed out in case there is a problem. Tne inline mode checking was
done even after mlx5_eswitch_enable_locked() call failed, which is
pointless.

Later on, commit 8c98ee77 ("net/mlx5e: E-Switch, Add extack messages
to devlink callbacks") converted the error/warning prints to extack
setting, which caused that the inline mode check error to overwrite
possible previous extack message when mlx5_eswitch_enable_locked()
failed. User then gets confusing error message.

Fix this by skipping check of inline mode after
mlx5_eswitch_enable_locked() call failed.

Signed-off-by: default avatarJiri Pirko <jiri@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent de1f0a65

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

+2 −1
Original line number Diff line number Diff line
@@ -2178,6 +2178,7 @@ static int esw_offloads_start(struct mlx5_eswitch *esw, 
				   "Failed setting eswitch to offloads");

		esw->mode = MLX5_ESWITCH_LEGACY;

		mlx5_rescan_drivers(esw->dev);

		return err;

	}

	if (esw->offloads.inline_mode == MLX5_INLINE_MODE_NONE) {

		if (mlx5_eswitch_inline_mode_get(esw,
@@ -2187,7 +2188,7 @@ static int esw_offloads_start(struct mlx5_eswitch *esw, 
					   "Inline mode is different between vports");

		}

	}

	return err;

	return 0;

}



static void mlx5_esw_offloads_rep_mark_set(struct mlx5_eswitch *esw,