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

Commit 10a8c3cd authored by Ralph Campbell's avatar Ralph Campbell Committed by Roland Dreier
Browse files

IB/ipath: Fix sanity checks on QP number of WRs and SGEs 



The receive queue number of WRs and SGEs shouldn't be checked if a
SRQ is specified.

Signed-off-by: default avatarRalph Campbell <ralph.campbell@qlogic.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 69bd74c6

drivers/infiniband/hw/ipath/ipath_qp.c

+16 −10
Original line number Diff line number Diff line
@@ -748,20 +748,26 @@ struct ib_qp *ipath_create_qp(struct ib_pd *ibpd, 
	struct ib_qp *ret;



	if (init_attr->cap.max_send_sge > ib_ipath_max_sges ||

	    init_attr->cap.max_recv_sge > ib_ipath_max_sges ||

	    init_attr->cap.max_send_wr > ib_ipath_max_qp_wrs ||

	    init_attr->cap.max_recv_wr > ib_ipath_max_qp_wrs) {

		ret = ERR_PTR(-ENOMEM);

	    init_attr->cap.max_send_wr > ib_ipath_max_qp_wrs) {

		ret = ERR_PTR(-EINVAL);

		goto bail;

	}



	/* Check receive queue parameters if no SRQ is specified. */

	if (!init_attr->srq) {

		if (init_attr->cap.max_recv_sge > ib_ipath_max_sges ||

		    init_attr->cap.max_recv_wr > ib_ipath_max_qp_wrs) {

			ret = ERR_PTR(-EINVAL);

			goto bail;

		}

		if (init_attr->cap.max_send_sge +

	    init_attr->cap.max_recv_sge +

		    init_attr->cap.max_send_wr +

		    init_attr->cap.max_recv_sge +

		    init_attr->cap.max_recv_wr == 0) {

			ret = ERR_PTR(-EINVAL);

			goto bail;

		}

	}



	switch (init_attr->qp_type) {

	case IB_QPT_UC: