After I spent a while looking in libibverbs for

ibv_get_device_list_compat() and not finding it, I finally realized
that it was a function in OMPI.  So let's name it with a proper ompi_
prefix, not an ibv_ prefix.

This commit was SVN r26867.

ompi/mca/btl/openib/btl_openib_component.c

@@ -2797,7 +2797,7 @@ btl_openib_component_init(int *num_btl_modules,
             opal_argv_copy(mca_btl_openib_component.if_exclude_list);
     }
 
-    ib_devs = ibv_get_device_list_compat(&num_devs);
+    ib_devs = ompi_ibv_get_device_list(&num_devs);
 
     if(0 == num_devs || NULL == ib_devs) {
         mca_btl_base_error_no_nics("OpenFabrics (openib)", "device");
@@ -3015,7 +3015,7 @@ btl_openib_component_init(int *num_btl_modules,
     btl_openib_modex_send();
 
     *num_btl_modules = mca_btl_openib_component.ib_num_btls;
-    ibv_free_device_list_compat(ib_devs);
+    ompi_ibv_free_device_list(ib_devs);
     if (NULL != mca_btl_openib_component.if_include_list) {
         opal_argv_free(mca_btl_openib_component.if_include_list);
         mca_btl_openib_component.if_include_list = NULL;

ompi/mca/common/ofautils/common_ofautils.c

@@ -41,7 +41,7 @@ const char *ibv_get_sysfs_path(void);
 #include "opal/util/output.h"
 #include "common_ofautils.h"
 
-struct ibv_device **ibv_get_device_list_compat(int *num_devs)
+struct ibv_device **ompi_ibv_get_device_list(int *num_devs)
 {
     struct ibv_device **ib_devs;
 
@@ -79,7 +79,7 @@ struct ibv_device **ibv_get_device_list_compat(int *num_devs)
     return ib_devs;
 }
 
-void ibv_free_device_list_compat(struct ibv_device **ib_devs)
+void ompi_ibv_free_device_list(struct ibv_device **ib_devs)
 {
 #ifdef HAVE_IBV_GET_DEVICE_LIST
     ibv_free_device_list(ib_devs);

ompi/mca/common/ofautils/common_ofautils.h

@@ -15,10 +15,10 @@
 #include "ompi_config.h"
 
 OMPI_DECLSPEC extern
-struct ibv_device **ibv_get_device_list_compat(int *num_devs);
+struct ibv_device **ompi_ibv_get_device_list(int *num_devs);
 
 OMPI_DECLSPEC extern
-void ibv_free_device_list_compat(struct ibv_device **ib_devs);
+void ompi_ibv_free_device_list(struct ibv_device **ib_devs);
 
 END_C_DECLS