From 7e09eb221ebb1db71d194e064645149203d7e827 Mon Sep 17 00:00:00 2001 From: Arlin Davis Date: Fri, 18 Jul 2014 11:17:03 -0700 Subject: [PATCH] cleanup build warnings Signed-off-by: Arlin Davis --- dapl/common/dapl_ep_modify.c | 5 ++--- dapl/openib_cma/cm.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dapl/common/dapl_ep_modify.c b/dapl/common/dapl_ep_modify.c index 0545870..d880c30 100644 --- a/dapl/common/dapl_ep_modify.c +++ b/dapl/common/dapl_ep_modify.c @@ -454,9 +454,8 @@ dapli_ep_modify_validate_parameters(IN DAT_EP_HANDLE ep_handle, if (ep_param_mask & DAT_EP_FIELD_RECV_EVD_HANDLE) { if (ep_param->recv_evd_handle != NULL && - (DAPL_BAD_HANDLE(ep_param->recv_evd_handle, DAPL_MAGIC_EVD) - || !((DAPL_EVD *) ep_param->recv_evd_handle)-> - evd_flags & DAT_EVD_DTO_FLAG)) + ((DAPL_BAD_HANDLE(ep_param->recv_evd_handle, DAPL_MAGIC_EVD) || + (((DAPL_EVD *)ep_param->recv_evd_handle)->evd_flags & DAT_EVD_DTO_FLAG)) == 0)) { dat_status = DAT_ERROR(DAT_INVALID_PARAMETER, DAT_INVALID_ARG3); diff --git a/dapl/openib_cma/cm.c b/dapl/openib_cma/cm.c index 4e9b7c4..34ae3e3 100644 --- a/dapl/openib_cma/cm.c +++ b/dapl/openib_cma/cm.c @@ -743,8 +743,7 @@ dapls_ib_setup_conn_listener(IN DAPL_IA * ia_ptr, dapls_cm_acquire(conn); /* create CM_ID, bind to local device, create QP */ - if (rdma_create_id - (g_cm_events, &conn->cm_id, (void *)conn, RDMA_PS_TCP)) { + if (rdma_create_id(g_cm_events, &conn->cm_id, (void *)conn, RDMA_PS_TCP)) { dapls_cm_release(conn); return (dapl_convert_errno(errno, "rdma_create_id")); } @@ -752,7 +751,7 @@ dapls_ib_setup_conn_listener(IN DAPL_IA * ia_ptr, /* open identifies the local device; per DAT specification */ /* Get family and address then set port to consumer's ServiceID */ dapl_os_memcpy(&addr, &ia_ptr->hca_ptr->hca_address, sizeof(addr)); - ((struct sockaddr_in *)&addr)->sin_port = SID_TO_PORT(ServiceID); + addr.sin6_port = SID_TO_PORT(ServiceID); if (rdma_bind_addr(conn->cm_id, (struct sockaddr *)&addr)) { if ((errno == EBUSY) || (errno == EADDRINUSE) || -- 2.41.0