From 9219bf696d7c69744a668a045c7f1d0bf36c471a Mon Sep 17 00:00:00 2001 From: Arlin Davis Date: Thu, 12 Mar 2015 16:02:40 -0400 Subject: [PATCH] cma: RR attributes moved to common ib_cm struct Signed-off-by: Arlin Davis --- dapl/openib_cma/cm.c | 4 ++-- dapl/openib_cma/dapl_ib_util.h | 4 ---- dapl/openib_cma/device.c | 4 ++-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dapl/openib_cma/cm.c b/dapl/openib_cma/cm.c index 18d9d09..79578e1 100644 --- a/dapl/openib_cma/cm.c +++ b/dapl/openib_cma/cm.c @@ -295,10 +295,10 @@ static struct dapl_cm_id *dapli_req_recv(struct dapl_cm_id *conn, /* Get requesters connect data, setup for accept */ new_conn->params.responder_resources = DAPL_MIN(event->param.conn.responder_resources, - conn->hca->ib_trans.rd_atom_in); + conn->hca->ib_trans.ib_cm.rd_atom_in); new_conn->params.initiator_depth = DAPL_MIN(event->param.conn.initiator_depth, - conn->hca->ib_trans.rd_atom_out); + conn->hca->ib_trans.ib_cm.rd_atom_out); new_conn->params.flow_control = event->param.conn.flow_control; new_conn->params.rnr_retry_count = diff --git a/dapl/openib_cma/dapl_ib_util.h b/dapl/openib_cma/dapl_ib_util.h index e0bcfdf..3738dc0 100755 --- a/dapl/openib_cma/dapl_ib_util.h +++ b/dapl/openib_cma/dapl_ib_util.h @@ -97,7 +97,6 @@ typedef struct _ib_hca_transport struct rdma_cm_id *cm_id; struct ibv_comp_channel *ib_cq; ib_cq_handle_t ib_cq_empty; - int max_inline_send; ib_async_handler_t async_unafiliated; void *async_un_ctx; ib_async_cq_handler_t async_cq_error; @@ -105,9 +104,6 @@ typedef struct _ib_hca_transport ib_async_qp_handler_t async_qp_error; uint8_t max_cm_timeout; uint8_t max_cm_retries; - /* device attributes */ - int rd_atom_in; - int rd_atom_out; struct ibv_context *ib_ctx; struct ibv_device *ib_dev; /* dapls_modify_qp_state */ diff --git a/dapl/openib_cma/device.c b/dapl/openib_cma/device.c index c9bb58d..9e87355 100644 --- a/dapl/openib_cma/device.c +++ b/dapl/openib_cma/device.c @@ -346,11 +346,11 @@ DAT_RETURN dapls_ib_open_hca(IN IB_HCA_NAME hca_name, /* set inline max with env or default, get local lid and gid 0 */ if (dapl_ib_inline_data(hca_ptr->ib_hca_handle)) { if (hca_ptr->ib_hca_handle->device->transport_type == IBV_TRANSPORT_IWARP) - hca_ptr->ib_trans.max_inline_send = + hca_ptr->ib_trans.ib_cm.max_inline = dapl_os_get_env_val("DAPL_MAX_INLINE", INLINE_SEND_IWARP_DEFAULT); else - hca_ptr->ib_trans.max_inline_send = + hca_ptr->ib_trans.ib_cm.max_inline = dapl_os_get_env_val("DAPL_MAX_INLINE", INLINE_SEND_IB_DEFAULT); } -- 2.41.0