From f6c5a608282e9c090be9c20aa36a416c6fa1d271 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Tue, 14 Jun 2011 16:31:53 -0700 Subject: [PATCH] --- yaml --- r: 272371 b: refs/heads/master c: 638ef7a6c6a599b2e4c00ebf35d281721d2a42f6 h: refs/heads/master i: 272369: e745e2eee4ed8cfbd5bdc31608aacdd96a941ca1 272367: 8f7046968e06f4f7afab8d33ae62ccf8a7d1af46 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/core/ucma.c | 5 ++++- trunk/include/rdma/rdma_user_cm.h | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a6a04b01191d..9c6a02340d55 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2d2e94152928209de13dea0535242c0e457bdcbb +refs/heads/master: 638ef7a6c6a599b2e4c00ebf35d281721d2a42f6 diff --git a/trunk/drivers/infiniband/core/ucma.c b/trunk/drivers/infiniband/core/ucma.c index 71be5eebd683..eb0a8e8a6943 100644 --- a/trunk/drivers/infiniband/core/ucma.c +++ b/trunk/drivers/infiniband/core/ucma.c @@ -276,7 +276,7 @@ static int ucma_event_handler(struct rdma_cm_id *cm_id, ucma_set_event_context(ctx, event, uevent); uevent->resp.event = event->event; uevent->resp.status = event->status; - if (cm_id->ps == RDMA_PS_UDP || cm_id->ps == RDMA_PS_IPOIB) + if (cm_id->qp_type == IB_QPT_UD) ucma_copy_ud_event(&uevent->resp.param.ud, &event->param.ud); else ucma_copy_conn_event(&uevent->resp.param.conn, @@ -377,6 +377,9 @@ static int ucma_get_qp_type(struct rdma_ucm_create_id *cmd, enum ib_qp_type *qp_ case RDMA_PS_IPOIB: *qp_type = IB_QPT_UD; return 0; + case RDMA_PS_IB: + *qp_type = cmd->qp_type; + return 0; default: return -EINVAL; } diff --git a/trunk/include/rdma/rdma_user_cm.h b/trunk/include/rdma/rdma_user_cm.h index fc82c1896f75..5348a000c8f3 100644 --- a/trunk/include/rdma/rdma_user_cm.h +++ b/trunk/include/rdma/rdma_user_cm.h @@ -77,7 +77,8 @@ struct rdma_ucm_create_id { __u64 uid; __u64 response; __u16 ps; - __u8 reserved[6]; + __u8 qp_type; + __u8 reserved[5]; }; struct rdma_ucm_create_id_resp {