From: Bryan O'Sullivan <bos@pathscale.com>
Date: Sat, 1 Jul 2006 11:35:54 +0000 (-0700)
Subject: [PATCH] IB/ipath: remove some duplicate code
X-Git-Tag: MMI-PSA29.97-13-9~48607
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6665ddee85bfc336d691ea5132a2c20a1d0e8053;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

[PATCH] IB/ipath: remove some duplicate code

Signed-off-by: Robert Walsh <robert.walsh@qlogic.com>
Signed-off-by: Bryan O'Sullivan <bryan.osullivan@qlogic.com>
Cc: "Michael S. Tsirkin" <mst@mellanox.co.il>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/infiniband/hw/ipath/ipath_qp.c b/drivers/infiniband/hw/ipath/ipath_qp.c
index e1d31bccf3eb..47271be65b0f 100644
--- a/drivers/infiniband/hw/ipath/ipath_qp.c
+++ b/drivers/infiniband/hw/ipath/ipath_qp.c
@@ -511,9 +511,6 @@ int ipath_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
 	if (attr_mask & IB_QP_QKEY)
 		qp->qkey = attr->qkey;
 
-	if (attr_mask & IB_QP_PKEY_INDEX)
-		qp->s_pkey_index = attr->pkey_index;
-
 	qp->state = new_state;
 	spin_unlock(&qp->s_lock);
 	spin_unlock_irqrestore(&qp->r_rq.lock, flags);