From: aru kolappan <aru.kolappan@oracle.com>
Date: Fri, 21 Dec 2018 01:28:45 +0000 (-0800)
Subject: mlx4_vnic: use the mlid while calling ib_detach_mcast
X-Git-Tag: v4.1.12-124.31.3~359
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e995a3919b4bb619a70119539c19da08bf5e1996;p=users%2Fjedix%2Flinux-maple.git

mlx4_vnic: use the mlid while calling ib_detach_mcast

In mlx4_vnic, vnic_mcast_detach_ll() calls ib_detach_mcast() with the port lid
instead of the mlid resulting in multicast detach to fail. This caused
the subsequent multicast attach to fail.

Orabug: 29029705

Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com>
Acked-by:    John Haxby <john.haxby@oracle.com>
Reviewed-by: Venkat Venkatsubra <venkat.x.venkatsubra@oracle.com>
Reviewed-by: Håkon Bugge <haakon.bugge@oracle.com>

Signed-off-by: aru kolappan <aru.kolappan@oracle.com>
Signed-off-by: Brian Maly <brian.maly@oracle.com>
---

diff --git a/drivers/net/ethernet/mellanox/mlx4_vnic/vnic_mcast.c b/drivers/net/ethernet/mellanox/mlx4_vnic/vnic_mcast.c
index c82190cd576b..8e9127eda6db 100644
--- a/drivers/net/ethernet/mellanox/mlx4_vnic/vnic_mcast.c
+++ b/drivers/net/ethernet/mellanox/mlx4_vnic/vnic_mcast.c
@@ -294,7 +294,8 @@ static void vnic_mcast_detach_ll(struct vnic_mcast *mcaste, struct mcast_root *m
 	}
 
 	if (!mcaste->sender_only)
-		rc = ib_detach_mcast(mcaste->qp, &mcaste->gid, port->attr.lid);
+		rc = ib_detach_mcast(mcaste->qp, &mcaste->gid,
+				     be16_to_cpu(mcaste->port_mcaste->rec.mlid));
 	else
 		rc = 0;