Add configure check for struct ibv_device.transport type, which was added in OFED v1.2. Still need to fix up oob and rdma_cm cpc's to do something better with this information...

This commit was SVN r17198.

config/ompi_check_openib.m4

@@ -10,7 +10,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
-# Copyright (c) 2006-2007 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2006-2008 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2006-2007 Los Alamos National Security, LLC.  All rights
 #                         reserved.
 # Copyright (c) 2006-2007 Mellanox Technologies. All rights reserved.
@@ -103,7 +103,14 @@ AC_DEFUN([OMPI_CHECK_OPENIB],[
           [AC_CHECK_DECLS([IBV_EVENT_CLIENT_REREGISTER], [], [], 
                           [#include <infiniband/verbs.h>])
            AC_CHECK_FUNCS([ibv_get_device_list ibv_resize_cq])
-           AC_CHECK_FUNCS([ibv_open_xrc_domain], [$1_have_xrc=1])])
+
+           # struct ibv_device.transport_type was added in OFED v1.2
+           AC_CHECK_MEMBERS([struct ibv_device.transport_type], [], [],
+                            [#include <infiniband/verbs.h>])
+
+           # ibv_open_xrc_domain was added in OFED 1.3
+           AC_CHECK_FUNCS([ibv_open_xrc_domain], [$1_have_xrc=1])
+          ])
 
     CPPFLAGS="$ompi_check_openib_$1_save_CPPFLAGS"
     LDFLAGS="$ompi_check_openib_$1_save_LDFLAGS"

ompi/mca/btl/openib/connect/btl_openib_connect_oob.c

@@ -9,7 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
- * Copyright (c) 2006-2007 Cisco, Inc.  All rights reserved.
+ * Copyright (c) 2006-2008 Cisco, Inc.  All rights reserved.
  * Copyright (c) 2006      Los Alamos National Security, LLC.  All rights
  *                         reserved. 
  *
@@ -141,11 +141,16 @@ static int oob_start_connect(mca_btl_base_endpoint_t *endpoint)
 
 static int oob_query(mca_btl_openib_hca_t *hca)
 {
+    /* JMS need something better than this */
+#if defined(HAVE_STRUCT_IBV_DEVICE_TRANSPORT_TYPE)
     if (IBV_TRANSPORT_IB == hca->ib_dev->transport_type) {
         return oob_priority;
     }
 
     return -1;
+#else
+    return oob_priority;
+#endif
 }
 
 /*

ompi/mca/btl/openib/connect/btl_openib_connect_rdma_cm.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007 Cisco, Inc.  All rights reserved.
+ * Copyright (c) 2007-2008 Cisco, Inc.  All rights reserved.
  *
  * $COPYRIGHT$
  * 
@@ -59,10 +59,13 @@ static int rdma_cm_connect(mca_btl_base_endpoint_t *e)
 
 static int rdma_cm_query(mca_btl_openib_hca_t *hca)
 {
+    /* JMS need something better than this */
+#if defined(HAVE_STRUCT_IBV_DEVICE_TRANSPORT_TYPE)
     if (IBV_TRANSPORT_IWARP == hca->ib_dev->transport_type) {
         BTL_ERROR(("rdma cm Not currently supported"));
         return rdma_cm_priority;
     }
+#endif
 
     return -1;
 }