Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 272319
b: refs/heads/master
c: 3ebeebc
h: refs/heads/master
i:
  272317: c591245
  272315: bd68cf2
  272311: ea40080
  272303: fa77c33
  272287: 620f048
  272255: 3d87ada
v: v3
  • Loading branch information
Kumar Sanghvi authored and Roland Dreier committed Oct 6, 2011
1 parent f9494d2 commit 0b3e45e
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9595480c5dd1f01e477e8c993d6b24fa484eca3f
refs/heads/master: 3ebeebc38b4b13384aba97f2e4acd6b48d47a65c
8 changes: 6 additions & 2 deletions trunk/drivers/infiniband/core/cma.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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);
Expand Down Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion trunk/include/rdma/iw_cm.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};

/**
Expand Down

0 comments on commit 0b3e45e

Please sign in to comment.