diff options
author | Steve Wise <swise@opengridcomputing.com> | 2007-03-06 15:43:58 -0500 |
---|---|---|
committer | Roland Dreier <rolandd@cisco.com> | 2007-03-06 15:50:45 -0500 |
commit | 2df50da00e679439aca08a59cd0b4db484159540 (patch) | |
tree | 84a58507c0492d0085d7a25a894e072a21e505d8 | |
parent | 42e31753546d2186d4a675e7d00daa02ea7c8e85 (diff) |
RDMA/cxgb3: Move QP to error on destroy if the state is IDLE
Change iwch_destroy_qp() to always move the QP to ERROR and let
iwch_modify_qp() decide what to do.
Signed-off-by: Steve Wise <swise@opengridcomputing.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
-rw-r--r-- | drivers/infiniband/hw/cxgb3/iwch_provider.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/infiniband/hw/cxgb3/iwch_provider.c b/drivers/infiniband/hw/cxgb3/iwch_provider.c index b357c11d148f..9fe7dfeb7c80 100644 --- a/drivers/infiniband/hw/cxgb3/iwch_provider.c +++ b/drivers/infiniband/hw/cxgb3/iwch_provider.c | |||
@@ -738,10 +738,8 @@ static int iwch_destroy_qp(struct ib_qp *ib_qp) | |||
738 | qhp = to_iwch_qp(ib_qp); | 738 | qhp = to_iwch_qp(ib_qp); |
739 | rhp = qhp->rhp; | 739 | rhp = qhp->rhp; |
740 | 740 | ||
741 | if (qhp->attr.state == IWCH_QP_STATE_RTS) { | 741 | attrs.next_state = IWCH_QP_STATE_ERROR; |
742 | attrs.next_state = IWCH_QP_STATE_ERROR; | 742 | iwch_modify_qp(rhp, qhp, IWCH_QP_ATTR_NEXT_STATE, &attrs, 0); |
743 | iwch_modify_qp(rhp, qhp, IWCH_QP_ATTR_NEXT_STATE, &attrs, 0); | ||
744 | } | ||
745 | wait_event(qhp->wait, !qhp->ep); | 743 | wait_event(qhp->wait, !qhp->ep); |
746 | 744 | ||
747 | remove_handle(rhp, &rhp->qpidr, qhp->wq.qpid); | 745 | remove_handle(rhp, &rhp->qpidr, qhp->wq.qpid); |