RDMA/cma: QP type check on received REQs should be AND not OR

Sean Hefty · rolandd · commit 4dd81e895655 · 2012-06-19T20:04:04.000-07:00
Change || check to the intended &amp;&amp; when checking the QP type in a
received connection request against the listening endpoint.

Signed-off-by: Sean Hefty &lt;sean.hefty@intel.com&gt;
Signed-off-by: Roland Dreier &lt;roland@purestorage.com&gt;
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
@@ -1184,7 +1184,7 @@ static void cma_set_req_event_data(struct rdma_cm_event *event,
 
 static int cma_check_req_qp_type(struct rdma_cm_id *id, struct ib_cm_event *ib_event)
 {
-	return (((ib_event->event == IB_CM_REQ_RECEIVED) ||
+	return (((ib_event->event == IB_CM_REQ_RECEIVED) &&
 		 (ib_event->param.req_rcvd.qp_type == id->qp_type)) ||
 		((ib_event->event == IB_CM_SIDR_REQ_RECEIVED) &&
 		 (id->qp_type == IB_QPT_UD)) ||

Original file line number	Diff line number	Diff line change
`@@ -1184,7 +1184,7 @@ static void cma_set_req_event_data(struct rdma_cm_event *event,`
`1184`	`1184`
`1185`	`1185`	`static int cma_check_req_qp_type(struct rdma_cm_id id, struct ib_cm_event ib_event)`
`1186`	`1186`	`{`
`1187`		`- return (((ib_event->event == IB_CM_REQ_RECEIVED) \|\|`
	`1187`	`+ return (((ib_event->event == IB_CM_REQ_RECEIVED) &&`
`1188`	`1188`	`(ib_event->param.req_rcvd.qp_type == id->qp_type)) \|\|`
`1189`	`1189`	`((ib_event->event == IB_CM_SIDR_REQ_RECEIVED) &&`
`1190`	`1190`	`(id->qp_type == IB_QPT_UD)) \|\|`