Skip to content

btl/openib: fix compiler warning, by HalR #472

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 13, 2015
Merged

btl/openib: fix compiler warning, by HalR #472

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions opal/mca/btl/openib/connect/btl_openib_connect_rdmacm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1302,7 +1302,9 @@ static int rdmacm_connect_endpoint(id_context_t *context,
rdmacm_contents_t *contents = context->contents;
rdmacm_endpoint_local_cpc_data_t *data;
mca_btl_openib_endpoint_t *endpoint;
#if !BTL_OPENIB_RDMACM_IB_ADDR
modex_message_t *message;
#endif

if (contents->server) {
endpoint = context->endpoint;
Expand Down Expand Up @@ -1341,8 +1343,8 @@ static int rdmacm_connect_endpoint(id_context_t *context,
return OPAL_SUCCESS;
}

message = (modex_message_t *) endpoint->endpoint_remote_cpc_data->cbm_modex_message;
#if !BTL_OPENIB_RDMACM_IB_ADDR
message = (modex_message_t *) endpoint->endpoint_remote_cpc_data->cbm_modex_message;
BTL_VERBOSE(("%s connected!!! local %x remote %x state = %d",
contents->server?"server":"client",
contents->ipaddr,
Expand Down Expand Up @@ -1530,16 +1532,16 @@ static int finish_connect(id_context_t *context)
struct rdma_conn_param conn_param;
private_data_t msg;
int rc;
struct sockaddr *peeraddr;
#if !BTL_OPENIB_RDMACM_IB_ADDR
struct sockaddr *peeraddr;
uint32_t remoteipaddr;
#endif
uint16_t remoteport;
#endif
modex_message_t *message;

#if !BTL_OPENIB_RDMACM_IB_ADDR
remoteport = rdma_get_dst_port(context->id);
peeraddr = rdma_get_peer_addr(context->id);
#if !BTL_OPENIB_RDMACM_IB_ADDR
remoteipaddr = ((struct sockaddr_in *)peeraddr)->sin_addr.s_addr;
#endif

Expand Down Expand Up @@ -1700,8 +1702,8 @@ static void *show_help_rdmacm_event_error(void *c)
static int event_handler(struct rdma_cm_event *event)
{
id_context_t *context = (id_context_t*) event->id->context;
rdmacm_contents_t *contents;
#if !BTL_OPENIB_RDMACM_IB_ADDR
rdmacm_contents_t *contents;
struct sockaddr *peeraddr, *localaddr;
uint32_t peeripaddr, localipaddr;
#endif
Expand All @@ -1713,9 +1715,9 @@ static int event_handler(struct rdma_cm_event *event)
return rc;
}

#if !BTL_OPENIB_RDMACM_IB_ADDR
contents = context->contents;

#if !BTL_OPENIB_RDMACM_IB_ADDR
localaddr = rdma_get_local_addr(event->id);
peeraddr = rdma_get_peer_addr(event->id);
localipaddr = ((struct sockaddr_in *)localaddr)->sin_addr.s_addr;
Expand Down