Commit:     041eab9136d8325c332429df71d05ba3e0ea8ebc
Parent:     614d49a21e96737f84b13f644ac813f8eb6d297a
Author:     Bryan O'Sullivan <[EMAIL PROTECTED]>
AuthorDate: Thu Mar 15 14:44:57 2007 -0700
Committer:  Roland Dreier <[EMAIL PROTECTED]>
CommitDate: Wed Apr 18 20:20:56 2007 -0700

    IB/ipath: Fix CQ flushing when QP is modified to error state
    If a receive work request has been removed from the queue but has not
    had a CQ entry generated for it and the QP is modified to the error
    state, the completion entry generated is incorrect.  This patch fixes
    the problem.
    Signed-off-by: Ralph Campbell <[EMAIL PROTECTED]>
    Signed-off-by: Bryan O'Sullivan <[EMAIL PROTECTED]>
    Signed-off-by: Roland Dreier <[EMAIL PROTECTED]>
 drivers/infiniband/hw/ipath/ipath_qp.c |    2 +-
 drivers/infiniband/hw/ipath/ipath_ud.c |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/infiniband/hw/ipath/ipath_qp.c 
index 64ea807..f671fd0 100644
--- a/drivers/infiniband/hw/ipath/ipath_qp.c
+++ b/drivers/infiniband/hw/ipath/ipath_qp.c
@@ -519,7 +519,7 @@ int ipath_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr 
        case IB_QPS_ERR:
-               ipath_error_qp(qp, IB_WC_GENERAL_ERR);
+               ipath_error_qp(qp, IB_WC_WR_FLUSH_ERR);
diff --git a/drivers/infiniband/hw/ipath/ipath_ud.c 
index a20261c..57625b8 100644
--- a/drivers/infiniband/hw/ipath/ipath_ud.c
+++ b/drivers/infiniband/hw/ipath/ipath_ud.c
@@ -647,6 +647,7 @@ void ipath_ud_rcv(struct ipath_ibdev *dev, struct 
ipath_ib_header *hdr,
                ipath_skip_sge(&qp->r_sge, sizeof(struct ib_grh));
        ipath_copy_sge(&qp->r_sge, data,
                       wc.byte_len - sizeof(struct ib_grh));
+       qp->r_wrid_valid = 0;
        wc.wr_id = qp->r_wr_id;
        wc.status = IB_WC_SUCCESS;
        wc.opcode = IB_WC_RECV;
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to