| From foo@baz Sat Aug 4 09:10:30 CEST 2018 |
| From: Eli Cohen <eli@mellanox.com> |
| Date: Mon, 16 Jul 2018 11:49:27 +0300 |
| Subject: net/mlx5e: E-Switch, Initialize eswitch only if eswitch manager |
| |
| From: Eli Cohen <eli@mellanox.com> |
| |
| [ Upstream commit 5f5991f36dce1e69dd8bd7495763eec2e28f08e7 ] |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c |
| +++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c |
| @@ -1616,7 +1616,7 @@ int mlx5_eswitch_init(struct mlx5_core_d |
| int vport_num; |
| int err; |
| |
| - if (!MLX5_VPORT_MANAGER(dev)) |
| + if (!MLX5_ESWITCH_MANAGER(dev)) |
| return 0; |
| |
| esw_info(dev, |
| @@ -1689,7 +1689,7 @@ abort: |
| |
| 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"); |
