Revert r30804.

We're going to be bringing a bunch of usnic code to the SVN trunk
soon, and I basically brought this commit over out of order.  So I'm
reverting it for now; the same functionality will come back shortly.

This commit was SVN r30805.

The following SVN revision numbers were found above:
  r30804 --> open-mpi/ompi@5bedcc15bf

config/ompi_check_openfabrics.m4

@@ -152,7 +152,7 @@ AC_DEFUN([OMPI_CHECK_OPENFABRICS],[
 
     # If we have the openib stuff available, find out what we've got
     AS_IF([test "$ompi_check_openib_happy" = "yes"],
-          [AC_CHECK_DECLS([IBV_EVENT_CLIENT_REREGISTER, IBV_ACCESS_SO, IBV_TRANSPORT_USNIC, IBV_TRANSPORT_USNIC_UDP, IBV_NODE_USNIC], [], [],
+          [AC_CHECK_DECLS([IBV_EVENT_CLIENT_REREGISTER, IBV_ACCESS_SO], [], [],
                           [#include <infiniband/verbs.h>])
            AC_CHECK_FUNCS([ibv_get_device_list ibv_resize_cq])
 

ompi/mca/btl/usnic/btl_usnic_component.c

@@ -1121,7 +1121,7 @@ static bool port_is_usnic(ompi_common_verbs_port_item_t *port)
     bool is_usnic = false;
     uint32_t *vpi;
 
-#if HAVE_DECL_IBV_TRANSPORT_USNIC && HAVE_DECL_IBV_NODE_USNIC
+#if BTL_USNIC_HAVE_IBV_USNIC
     /* If we have the IB_*_USNIC constants, then take any
        device which advertises them */
     if (IBV_TRANSPORT_USNIC == port->device->device->transport_type &&

ompi/mca/btl/usnic/btl_usnic_module.c

@@ -1488,7 +1488,7 @@ static void module_async_event_callback(int fd, short flags, void *arg)
 
         case IBV_EVENT_QP_FATAL:
         case IBV_EVENT_PORT_ERR:
-#if HAVE_DECL_IBV_EVENT_GID_CHANGE
+#if BTL_USNIC_HAVE_IBV_EVENT_GID_CHANGE
         case IBV_EVENT_GID_CHANGE:
 #endif
         default:

ompi/mca/btl/usnic/configure.m4

@@ -49,12 +49,33 @@ AC_DEFUN([MCA_ompi_btl_usnic_CONFIG],[
           ]
     )
 
+    # Do we have the IBV_TRANSPORT_USNIC / IBV_NODE_USNIC defines?
+    # (note: if we have one, we have both)
+    btl_usnic_have_ibv_usnic=0
+    btl_usnic_have_ibv_event_gid_change=0
     AS_IF([test "$btl_usnic_happy" = "yes"],
-          [AC_CHECK_DECLS([IBV_EVENT_GID_CHANGE, ibv_event_type_str], [], [],
+          [AC_CHECK_DECL([IBV_NODE_USNIC], 
+                         [btl_usnic_have_ibv_usnic=1],
+                         [],
+                         [ #include <infiniband/verbs.h> 
+])
+
+           AC_CHECK_DECL([IBV_EVENT_GID_CHANGE], 
+                         [btl_usnic_have_ibv_event_gid_change=1],
+                         [],
+                         [ #include <infiniband/verbs.h> 
+])
+           AC_CHECK_DECLS([ibv_event_type_str], [], [],
                           [#include <infiniband/verbs.h>
 ])
           ]
     )
+    AC_DEFINE_UNQUOTED([BTL_USNIC_HAVE_IBV_USNIC], 
+                       [$btl_usnic_have_ibv_usnic],
+                       [Whether we have IBV_NODE_USNIC / IBV_TRANSPORT_USNIC or not])
+    AC_DEFINE_UNQUOTED([BTL_USNIC_HAVE_IBV_EVENT_GID_CHANGE], 
+                       [$btl_usnic_have_ibv_event_gid_change],
+                       [Whether we have IBV_EVENT_GID_CHANGE or not])
 
     AS_IF([test "$btl_usnic_happy" = "yes"],
           [btl_usnic_WRAPPER_EXTRA_LDFLAGS="$btl_usnic_LDFLAGS"

ompi/mca/common/verbs/common_verbs.h

@@ -79,17 +79,11 @@ enum {
     OMPI_COMMON_VERBS_FLAGS_UD = 0x4,
     OMPI_COMMON_VERBS_FLAGS_TRANSPORT_IB = 0x8,
     OMPI_COMMON_VERBS_FLAGS_TRANSPORT_IWARP = 0x10,
-#if HAVE_DECL_IBV_TRANSPORT_USNIC
-    OMPI_COMMON_VERBS_FLAGS_TRANSPORT_USNIC = 0x20,
-#endif
-#if HAVE_DECL_IBV_TRANSPORT_USNIC_UDP
-    OMPI_COMMON_VERBS_FLAGS_TRANSPORT_USNIC_UDP = 0x40,
-#endif
     /* Note that these 2 link layer flags will only be useful if
        defined(HAVE_IBV_LINK_LAYER_ETHERNET). Otherwise, they will be
        ignored. */
-    OMPI_COMMON_VERBS_FLAGS_LINK_LAYER_IB = 0x80,
+    OMPI_COMMON_VERBS_FLAGS_LINK_LAYER_IB = 0x20,
-    OMPI_COMMON_VERBS_FLAGS_LINK_LAYER_ETHERNET = 0x100,
+    OMPI_COMMON_VERBS_FLAGS_LINK_LAYER_ETHERNET = 0x40,
     OMPI_COMMON_VERBS_FLAGS_MAX
 };
 

ompi/mca/common/verbs/common_verbs_find_ports.c

@@ -165,12 +165,6 @@ static const char *transport_name_to_str(enum ibv_transport_type transport_type)
     switch(transport_type) {
     case IBV_TRANSPORT_IB:      return "IB";
     case IBV_TRANSPORT_IWARP:   return "IWARP";
-#if HAVE_DECL_IBV_TRANSPORT_USNIC
-    case IBV_TRANSPORT_USNIC:     return "usNIC";
-#endif
-#if HAVE_DECL_IBV_TRANSPORT_USNIC_UDP
-    case IBV_TRANSPORT_USNIC_UDP: return "usNIC UDP";
-#endif
     case IBV_TRANSPORT_UNKNOWN: 
     default:                    return "unknown";
     }
@@ -337,24 +331,6 @@ opal_list_t *ompi_common_verbs_find_ports(const char *if_include,
                                 transport_name_to_str(device->transport_type));
             want = false;
         }
-#if HAVE_DECL_IBV_TRANSPORT_USNIC
-        if (flags & OMPI_COMMON_VERBS_FLAGS_TRANSPORT_USNIC &&
-            IBV_TRANSPORT_USNIC != device->transport_type) {
-            opal_output_verbose(5, stream, "verbs interface %s has wrong type (has %s, want usNIC)",
-                                ibv_get_device_name(device),
-                                transport_name_to_str(device->transport_type));
-            want = false;
-        }
-#endif
-#if HAVE_DECL_IBV_TRANSPORT_USNIC_UDP
-        if (flags & OMPI_COMMON_VERBS_FLAGS_TRANSPORT_USNIC_UDP &&
-            IBV_TRANSPORT_USNIC_UDP != device->transport_type) {
-            opal_output_verbose(5, stream, "verbs interface %s has wrong type (has %s, want usNIC/UDP)",
-                                ibv_get_device_name(device),
-                                transport_name_to_str(device->transport_type));
-            want = false;
-        }
-#endif
 
         /* Check for RC or UD QP support */
         if (flags & OMPI_COMMON_VERBS_FLAGS_RC ||