Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 041eab91 authored by Bryan O'Sullivan's avatar Bryan O'Sullivan Committed by Roland Dreier
Browse files

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: default avatarRalph Campbell <ralph.campbell@qlogic.com>
Signed-off-by: default avatarBryan O'Sullivan <bryan.osullivan@qlogic.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 614d49a2

drivers/infiniband/hw/ipath/ipath_qp.c

+1 −1
Original line number Diff line number Diff line
@@ -519,7 +519,7 @@ int ipath_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, 
		break;



	case IB_QPS_ERR:

		ipath_error_qp(qp, IB_WC_GENERAL_ERR);

		ipath_error_qp(qp, IB_WC_WR_FLUSH_ERR);

		break;



	default:

drivers/infiniband/hw/ipath/ipath_ud.c

+1 −0
Original line number Diff line number Diff line
@@ -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;