2 files changed, 11 insertions, 17 deletions

diff --git a/drivers/infiniband/hw/cxgb4/cq.c b/drivers/infiniband/hw/cxgb4/cq.c
index ce468e542428..e17b155b3758 100644
--- a/drivers/infiniband/hw/cxgb4/cq.c
+++ b/drivers/infiniband/hw/cxgb4/cq.c
@@ -235,27 +235,21 @@ int c4iw_flush_sq(struct c4iw_qp *qhp)
         struct t4_cq *cq = &chp->cq;
         int idx;
         struct t4_swsqe *swsqe;
-        int error = (qhp->attr.state != C4IW_QP_STATE_CLOSING &&
-                        qhp->attr.state != C4IW_QP_STATE_IDLE);
 
         if (wq->sq.flush_cidx == -1)
                 wq->sq.flush_cidx = wq->sq.cidx;
         idx = wq->sq.flush_cidx;
         BUG_ON(idx >= wq->sq.size);
         while (idx != wq->sq.pidx) {
-                if (error) {
-                        swsqe = &wq->sq.sw_sq[idx];
-                        BUG_ON(swsqe->flushed);
-                        swsqe->flushed = 1;
-                        insert_sq_cqe(wq, cq, swsqe);
-                        if (wq->sq.oldest_read == swsqe) {
-                                BUG_ON(swsqe->opcode != FW_RI_READ_REQ);
-                                advance_oldest_read(wq);
-                        }
-                        flushed++;
-                } else {
-                        t4_sq_consume(wq);
+                swsqe = &wq->sq.sw_sq[idx];
+                BUG_ON(swsqe->flushed);
+                swsqe->flushed = 1;
+                insert_sq_cqe(wq, cq, swsqe);
+                if (wq->sq.oldest_read == swsqe) {
+                        BUG_ON(swsqe->opcode != FW_RI_READ_REQ);
+                        advance_oldest_read(wq);
                 }
+                flushed++;
                 if (++idx == wq->sq.size)
                         idx = 0;
         }
diff --git a/drivers/infiniband/hw/cxgb4/qp.c b/drivers/infiniband/hw/cxgb4/qp.c
index e2fcbf4814f2..9b4a8b88908e 100644
--- a/drivers/infiniband/hw/cxgb4/qp.c
+++ b/drivers/infiniband/hw/cxgb4/qp.c
@@ -1367,6 +1367,7 @@ int c4iw_modify_qp(struct c4iw_dev *rhp, struct c4iw_qp *qhp,
                 switch (attrs->next_state) {
                 case C4IW_QP_STATE_CLOSING:
                         BUG_ON(atomic_read(&qhp->ep->com.kref.refcount) < 2);
+                        t4_set_wq_in_error(&qhp->wq);
                         set_state(qhp, C4IW_QP_STATE_CLOSING);
                         ep = qhp->ep;
                         if (!internal) {
@@ -1374,16 +1375,15 @@ int c4iw_modify_qp(struct c4iw_dev *rhp, struct c4iw_qp *qhp,
                                 disconnect = 1;
                                 c4iw_get_ep(&qhp->ep->com);
                         }
-                        t4_set_wq_in_error(&qhp->wq);
                         ret = rdma_fini(rhp, qhp, ep);
                         if (ret)
                                 goto err;
                         break;
                 case C4IW_QP_STATE_TERMINATE:
+                        t4_set_wq_in_error(&qhp->wq);
                         set_state(qhp, C4IW_QP_STATE_TERMINATE);
                         qhp->attr.layer_etype = attrs->layer_etype;
                         qhp->attr.ecode = attrs->ecode;
-                        t4_set_wq_in_error(&qhp->wq);
                         ep = qhp->ep;
                         disconnect = 1;
                         if (!internal)
@@ -1396,8 +1396,8 @@ int c4iw_modify_qp(struct c4iw_dev *rhp, struct c4iw_qp *qhp,
                         c4iw_get_ep(&qhp->ep->com);
                         break;
                 case C4IW_QP_STATE_ERROR:
-                        set_state(qhp, C4IW_QP_STATE_ERROR);
                         t4_set_wq_in_error(&qhp->wq);
+                        set_state(qhp, C4IW_QP_STATE_ERROR);
                         if (!internal) {
                                 abort = 1;
                                 disconnect = 1;