From 0b3e45e0eaed0a55a7e6592a77591283559a5429 Mon Sep 17 00:00:00 2001 From: Kumar Sanghvi Date: Sun, 25 Sep 2011 20:17:43 +0530 Subject: [PATCH] --- yaml --- r: 272319 b: refs/heads/master c: 3ebeebc38b4b13384aba97f2e4acd6b48d47a65c h: refs/heads/master i: 272317: c591245fec26ea42b22fc23149111c4b12f1d150 272315: bd68cf241e0b8b6d87361811a17bee8535fdd305 272311: ea40080d846695dc980d85d9cdcdbeb2106df5d1 272303: fa77c336a571f85e61aa6393e1bc832f6f294d47 272287: 620f0480113fec1bfd024928722ebd7bd4d74be2 272255: 3d87adae544a81e89b1a1b67f307caf5d302d7e0 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/core/cma.c | 8 ++++++-- trunk/include/rdma/iw_cm.h | 4 +++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 31ea51b77972..795317aa7d2e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9595480c5dd1f01e477e8c993d6b24fa484eca3f +refs/heads/master: 3ebeebc38b4b13384aba97f2e4acd6b48d47a65c diff --git a/trunk/drivers/infiniband/core/cma.c b/trunk/drivers/infiniband/core/cma.c index 31d958e2c9ec..3e7104554597 100644 --- a/trunk/drivers/infiniband/core/cma.c +++ b/trunk/drivers/infiniband/core/cma.c @@ -1340,6 +1340,8 @@ static int cma_iw_handler(struct iw_cm_id *iw_id, struct iw_cm_event *iw_event) switch (iw_event->status) { case 0: event.event = RDMA_CM_EVENT_ESTABLISHED; + event.param.conn.initiator_depth = iw_event->ird; + event.param.conn.responder_resources = iw_event->ord; break; case -ECONNRESET: case -ECONNREFUSED: @@ -1355,6 +1357,8 @@ static int cma_iw_handler(struct iw_cm_id *iw_id, struct iw_cm_event *iw_event) break; case IW_CM_EVENT_ESTABLISHED: event.event = RDMA_CM_EVENT_ESTABLISHED; + event.param.conn.initiator_depth = iw_event->ird; + event.param.conn.responder_resources = iw_event->ord; break; default: BUG_ON(1); @@ -1445,8 +1449,8 @@ static int iw_conn_req_handler(struct iw_cm_id *cm_id, event.event = RDMA_CM_EVENT_CONNECT_REQUEST; event.param.conn.private_data = iw_event->private_data; event.param.conn.private_data_len = iw_event->private_data_len; - event.param.conn.initiator_depth = attr.max_qp_init_rd_atom; - event.param.conn.responder_resources = attr.max_qp_rd_atom; + event.param.conn.initiator_depth = iw_event->ird; + event.param.conn.responder_resources = iw_event->ord; /* * Protect against the user destroying conn_id from another thread diff --git a/trunk/include/rdma/iw_cm.h b/trunk/include/rdma/iw_cm.h index 2d0191c90f9e..1a046b1595cc 100644 --- a/trunk/include/rdma/iw_cm.h +++ b/trunk/include/rdma/iw_cm.h @@ -52,8 +52,10 @@ struct iw_cm_event { struct sockaddr_in local_addr; struct sockaddr_in remote_addr; void *private_data; - u8 private_data_len; void *provider_data; + u8 private_data_len; + u8 ord; + u8 ird; }; /**