RDMA/nes: In nes_post_send() always set bad_wr on error
authorFrank Zago <fzago@systemfabricworks.com>
Wed, 9 Dec 2009 21:51:36 +0000 (13:51 -0800)
committerRoland Dreier <rolandd@cisco.com>
Wed, 9 Dec 2009 21:51:36 +0000 (13:51 -0800)
On error, set bad_wr in nes_post_send().  Stop processing ib_wr queue
when an error is detected.

Signed-off-by: Frank Zago <fzago@systemfabricworks.com>
Signed-off-by: Chien Tung <chien.tin.tung@intel.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
drivers/infiniband/hw/nes/nes_verbs.c

index a680c42d6e8cb3b72a33c5a6c707d15cc294b202..25b52d2478a8a8bc60175d65bf982994e8e4fb2c 100644 (file)
@@ -3386,8 +3386,10 @@ static int nes_post_send(struct ib_qp *ibqp, struct ib_send_wr *ib_wr,
        wqe_count = 0;
        total_payload_length = 0;
 
-       if (nesqp->ibqp_state > IB_QPS_RTS)
-               return -EINVAL;
+       if (nesqp->ibqp_state > IB_QPS_RTS) {
+               err = -EINVAL;
+               goto out;
+       }
 
        spin_lock_irqsave(&nesqp->lock, flags);
 
@@ -3498,6 +3500,9 @@ static int nes_post_send(struct ib_qp *ibqp, struct ib_send_wr *ib_wr,
                                        break;
                        }
 
+               if (err)
+                       break;
+
                if (ib_wr->send_flags & IB_SEND_SIGNALED) {
                        wqe_misc |= NES_IWARP_SQ_WQE_SIGNALED_COMPL;
                }
@@ -3522,6 +3527,7 @@ static int nes_post_send(struct ib_qp *ibqp, struct ib_send_wr *ib_wr,
 
        spin_unlock_irqrestore(&nesqp->lock, flags);
 
+out:
        if (err)
                *bad_wr = ib_wr;
        return err;