mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-16 07:35:14 +00:00
net/mlx5e: E-Switch, Initialize eswitch only if eswitch manager
[ Upstream commit5f5991f36d
] Execute mlx5_eswitch_init() only if we have MLX5_ESWITCH_MANAGER capabilities. Do the same for mlx5_eswitch_cleanup(). Fixes:a9f7705ffd
("net/mlx5: Unify vport manager capability check") Signed-off-by: Eli Cohen <eli@mellanox.com> Signed-off-by: Saeed Mahameed <saeedm@mellanox.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
e0638b6a05
commit
a766ccbf1d
1 changed files with 2 additions and 2 deletions
|
@ -1616,7 +1616,7 @@ int mlx5_eswitch_init(struct mlx5_core_dev *dev)
|
||||||
int vport_num;
|
int vport_num;
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
if (!MLX5_VPORT_MANAGER(dev))
|
if (!MLX5_ESWITCH_MANAGER(dev))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
esw_info(dev,
|
esw_info(dev,
|
||||||
|
@ -1689,7 +1689,7 @@ int mlx5_eswitch_init(struct mlx5_core_dev *dev)
|
||||||
|
|
||||||
void mlx5_eswitch_cleanup(struct mlx5_eswitch *esw)
|
void mlx5_eswitch_cleanup(struct mlx5_eswitch *esw)
|
||||||
{
|
{
|
||||||
if (!esw || !MLX5_VPORT_MANAGER(esw->dev))
|
if (!esw || !MLX5_ESWITCH_MANAGER(esw->dev))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
esw_info(esw->dev, "cleanup\n");
|
esw_info(esw->dev, "cleanup\n");
|
||||||
|
|
Loading…
Reference in a new issue