Merge commit 'v2.6.26-rc9' into cpus4096

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/infiniband/hw/ehca/ehca_reqs.c b/drivers/infiniband/hw/ehca/ehca_reqs.c
index bbe0436f4f75..f093b0033daf 100644
--- a/drivers/infiniband/hw/ehca/ehca_reqs.c
+++ b/drivers/infiniband/hw/ehca/ehca_reqs.c
@@ -421,8 +421,10 @@ int ehca_post_send(struct ib_qp *qp,
         int ret = 0;
         unsigned long flags;
 
-        if (unlikely(my_qp->state != IB_QPS_RTS)) {
-                ehca_err(qp->device, "QP not in RTS state  qpn=%x", qp->qp_num);
+        /* Reject WR if QP is in RESET, INIT or RTR state */
+        if (unlikely(my_qp->state < IB_QPS_RTS)) {
+                ehca_err(qp->device, "Invalid QP state  qp_state=%d qpn=%x",
+                         my_qp->state, qp->qp_num);
                 return -EINVAL;
         }