diff options
author | Eli Cohen <eli@mellanox.com> | 2018-07-16 04:49:27 -0400 |
---|---|---|
committer | Saeed Mahameed <saeedm@mellanox.com> | 2018-07-31 15:58:43 -0400 |
commit | 5f5991f36dce1e69dd8bd7495763eec2e28f08e7 (patch) | |
tree | 0c6eee78d4b1f7e715efc9225846fa8e2d8cbf39 | |
parent | 6751e7c66cb8689491b89fe02c71d1d44394412b (diff) |
net/mlx5e: E-Switch, Initialize eswitch only if eswitch manager
Execute mlx5_eswitch_init() only if we have MLX5_ESWITCH_MANAGER
capabilities.
Do the same for mlx5_eswitch_cleanup().
Fixes: a9f7705ffd66 ("net/mlx5: Unify vport manager capability check")
Signed-off-by: Eli Cohen <eli@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c index dd01ad4c0b54..40dba9e8af92 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | |||
@@ -1696,7 +1696,7 @@ int mlx5_eswitch_init(struct mlx5_core_dev *dev) | |||
1696 | int vport_num; | 1696 | int vport_num; |
1697 | int err; | 1697 | int err; |
1698 | 1698 | ||
1699 | if (!MLX5_VPORT_MANAGER(dev)) | 1699 | if (!MLX5_ESWITCH_MANAGER(dev)) |
1700 | return 0; | 1700 | return 0; |
1701 | 1701 | ||
1702 | esw_info(dev, | 1702 | esw_info(dev, |
@@ -1765,7 +1765,7 @@ abort: | |||
1765 | 1765 | ||
1766 | void mlx5_eswitch_cleanup(struct mlx5_eswitch *esw) | 1766 | void mlx5_eswitch_cleanup(struct mlx5_eswitch *esw) |
1767 | { | 1767 | { |
1768 | if (!esw || !MLX5_VPORT_MANAGER(esw->dev)) | 1768 | if (!esw || !MLX5_ESWITCH_MANAGER(esw->dev)) |
1769 | return; | 1769 | return; |
1770 | 1770 | ||
1771 | esw_info(esw->dev, "cleanup\n"); | 1771 | esw_info(esw->dev, "cleanup\n"); |