From 164e42b51288e052797245b165a3f6a88212a75f Mon Sep 17 00:00:00 2001
From: Jack Morgenstein <jackm@mellanox.co.il>
Date: Tue, 18 Oct 2005 14:46:38 -0700
Subject: [PATCH] --- yaml --- r: 10719 b: refs/heads/master c:
 7150bf8a98f14f1ba67e090ef2778004c746f465 h: refs/heads/master i:   10717:
 a9c58acd4e46a1f5a0b29821a9d5df9682ee7673   10715:
 58701d25de33dfa66eb5ecb2b831fb72035b303b   10711:
 06dbbfe405e80743219bea89f3b034fd16543c92   10703:
 58a5efca7411dc52b9b5b8d1fb5ab503a5dbc889   10687:
 bd9089edc40b9e2b26709bad6fca4448ebd98411 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/infiniband/hw/mthca/mthca_mcg.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 349f49296372..2d9cf0256d35 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba8e9310244180bbc820e865d2e4378809b4a443
+refs/heads/master: 7150bf8a98f14f1ba67e090ef2778004c746f465
diff --git a/trunk/drivers/infiniband/hw/mthca/mthca_mcg.c b/trunk/drivers/infiniband/hw/mthca/mthca_mcg.c
index 9a0612a9d304..b47ea7daf088 100644
--- a/trunk/drivers/infiniband/hw/mthca/mthca_mcg.c
+++ b/trunk/drivers/infiniband/hw/mthca/mthca_mcg.c
@@ -185,7 +185,12 @@ int mthca_multicast_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
 	}
 
 	for (i = 0; i < MTHCA_QP_PER_MGM; ++i)
-		if (!(mgm->qp[i] & cpu_to_be32(1 << 31))) {
+		if (mgm->qp[i] == cpu_to_be32(ibqp->qp_num | (1 << 31))) {
+			mthca_dbg(dev, "QP %06x already a member of MGM\n", 
+				  ibqp->qp_num);
+			err = 0;
+			goto out;
+		} else if (!(mgm->qp[i] & cpu_to_be32(1 << 31))) {
 			mgm->qp[i] = cpu_to_be32(ibqp->qp_num | (1 << 31));
 			break;
 		}