From 361019f25672cc077e0ee98d1d6dc234b0751a0e Mon Sep 17 00:00:00 2001 From: Roland Dreier Date: Sun, 24 Jun 2012 04:59:59 -0700 Subject: [PATCH] --- yaml --- r: 311244 b: refs/heads/master c: 2e51fd3c13e330d9364a211ddcd3e38771eeb4b4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/core/cma.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7ea6f261009e..a7670cf0bb9c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7b33dc2b050b71de0e202885a26caffbc864d072 +refs/heads/master: 2e51fd3c13e330d9364a211ddcd3e38771eeb4b4 diff --git a/trunk/drivers/infiniband/core/cma.c b/trunk/drivers/infiniband/core/cma.c index 55d5642eb10a..2e826f9702c6 100644 --- a/trunk/drivers/infiniband/core/cma.c +++ b/trunk/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)) ||