RDMA/mlx5: Free second uplink ib port

The cited patch introduce ib port for the slave device uplink in
case of multiport eswitch. However, this ib port didn't perform
anything when unloaded.
Unload the new ib port properly.

Signed-off-by: Shay Drory <shayd@nvidia.com>
Reviewed-by: Mark Bloch <mbloch@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/infiniband/hw/mlx5/ib_rep.c b/drivers/infiniband/hw/mlx5/ib_rep.c
index ddcfc116b19a525b0bbee87a4d5d9481b13d34dc..a4db22fe18838cc961f98d1c05674cc2df0ffa25 100644 (file)
--- a/drivers/infiniband/hw/mlx5/ib_rep.c
+++ b/drivers/infiniband/hw/mlx5/ib_rep.c
@@ -126,7 +126,7 @@ mlx5_ib_vport_rep_unload(struct mlx5_eswitch_rep *rep)
            !mlx5_lag_is_master(mdev)) {
                struct mlx5_core_dev *peer_mdev;
 
-               if (rep->vport == MLX5_VPORT_UPLINK)
+               if (rep->vport == MLX5_VPORT_UPLINK && !mlx5_lag_is_mpesw(mdev))
                        return;
                peer_mdev = mlx5_lag_get_peer_mdev(mdev);
                vport_index += mlx5_eswitch_get_total_vports(peer_mdev);
@@ -146,6 +146,9 @@ mlx5_ib_vport_rep_unload(struct mlx5_eswitch_rep *rep)
                struct mlx5_core_dev *peer_mdev;
                struct mlx5_eswitch *esw;
 
+               if (mlx5_lag_is_shared_fdb(mdev) && !mlx5_lag_is_master(mdev))
+                       return;
+
                if (mlx5_lag_is_shared_fdb(mdev)) {
                        peer_mdev = mlx5_lag_get_peer_mdev(mdev);
                        esw = peer_mdev->priv.eswitch;