diff options
| author |   Amrani, Ram <Ram.Amrani@cavium.com> | 2016-12-22 14:40:36 +0200 |
|---|---|---|
| committer |   Doug Ledford <dledford@redhat.com> | 2016-12-22 11:36:12 -0500 |
| commit | b4c2cc48aa0be767281669bff9f230e81ef27c56 (patch) | |
| tree | 15927b27895e77f25f50237b793c443db21f3582 /drivers/infiniband/hw/qedr | |
| parent | qedr: return correct value on modify qp (diff) | |
| download | linux-dev-b4c2cc48aa0be767281669bff9f230e81ef27c56.tar.xz linux-dev-b4c2cc48aa0be767281669bff9f230e81ef27c56.zip | |
qedr: modify QP state to error when destroying it
Current code didn't modify the QP state to error because it queried the
QP state as a bitmap while it isn't. So the code never got executed.
This patch fixes this and queries for each QP state respectively and not
at once via a bitmask.
Signed-off-by: Ram Amrani <Ram.Amrani@cavium.com>
Reviewed-by: Michal Kalderon <Michal.Kalderon@cavium.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/hw/qedr')
| -rw-r--r-- | drivers/infiniband/hw/qedr/verbs.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/qedr/verbs.c b/drivers/infiniband/hw/qedr/verbs.c index 5d1980dd6c48..0237ff986829 100644 --- a/drivers/infiniband/hw/qedr/verbs.c +++ b/drivers/infiniband/hw/qedr/verbs.c @@ -2078,8 +2078,10 @@ int qedr_destroy_qp(struct ib_qp *ibqp) DP_DEBUG(dev, QEDR_MSG_QP, "destroy qp: destroying %p, qp type=%d\n", qp, qp->qp_type); - if (qp->state != (QED_ROCE_QP_STATE_RESET | QED_ROCE_QP_STATE_ERR | - QED_ROCE_QP_STATE_INIT)) { + if ((qp->state != QED_ROCE_QP_STATE_RESET) && + (qp->state != QED_ROCE_QP_STATE_ERR) && + (qp->state != QED_ROCE_QP_STATE_INIT)) { + attr.qp_state = IB_QPS_ERR; attr_mask |= IB_QP_STATE; |