aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorBryan O'Sullivan <bos@pathscale.com>2006-07-01 07:35:54 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-01 12:55:59 -0400
commit6665ddee85bfc336d691ea5132a2c20a1d0e8053 (patch)
treed45fcdf5a51652f9007ed06497c40aba5d4e8c5b /drivers
parent685f97e81b5510cfcbeccf6ae0400d3664ba8ea3 (diff)
[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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/infiniband/hw/ipath/ipath_qp.c3
1 files changed, 0 insertions, 3 deletions
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,
511 if (attr_mask & IB_QP_QKEY) 511 if (attr_mask & IB_QP_QKEY)
512 qp->qkey = attr->qkey; 512 qp->qkey = attr->qkey;
513 513
514 if (attr_mask & IB_QP_PKEY_INDEX)
515 qp->s_pkey_index = attr->pkey_index;
516
517 qp->state = new_state; 514 qp->state = new_state;
518 spin_unlock(&qp->s_lock); 515 spin_unlock(&qp->s_lock);
519 spin_unlock_irqrestore(&qp->r_rq.lock, flags); 516 spin_unlock_irqrestore(&qp->r_rq.lock, flags);