From 9f80aa2d2891d94ba3a3b7870d4a58b1871e50f6 Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Tue, 20 Jan 2015 11:31:50 +0900 Subject: [PATCH] btl/openib: regression fix when rdmacm or udcm are disabled This fixes a regression introduced in open-mpi/ompi@661c35ca677512129cef9bca1bbbf5b5b71d951b Thanks to Mark Santcroos for reporting this issue --- opal/mca/btl/openib/connect/btl_openib_connect_base.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/opal/mca/btl/openib/connect/btl_openib_connect_base.c b/opal/mca/btl/openib/connect/btl_openib_connect_base.c index 11c64f5785..71ba607f06 100644 --- a/opal/mca/btl/openib/connect/btl_openib_connect_base.c +++ b/opal/mca/btl/openib/connect/btl_openib_connect_base.c @@ -46,11 +46,19 @@ static opal_btl_openib_connect_base_component_t *all[] = { /* Always have an entry here so that the CP indexes will always be the same: if RDMA CM is not available, use the "empty" CPC */ +#if OPAL_HAVE_RDMACM &opal_btl_openib_connect_rdmacm, +#else + &opal_btl_openib_connect_empty, +#endif /* Always have an entry here so that the CP indexes will always be the same: if UD CM is not enabled, use the "empty" CPC */ +#if OPAL_HAVE_UDCM &opal_btl_openib_connect_udcm, +#else + &opal_btl_openib_connect_empty, +#endif NULL };