config: add conditional check for new verbs port_attr.link_layer

Check for link_layer type ETHERNET and set global for GID
configuration on modify QP.

Signed-off-by: Arlin Davis <arlin.r.davis@intel.com>

diff --git a/Makefile.am b/Makefile.am
index 3dd9c3a882262d1cbbcd73732d932fad88916b35..124d913e5bd2f4e0df7c8aff7f1efd736cdec26f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,6 +15,10 @@ if OS_SUSE11
 OSFLAGS += -DSUSE_11
 endif
 
+if DEFINE_ATTR_LINK_LAYER
+XFLAGS = -DDEFINE_ATTR_LINK_LAYER
+endif
+
 if DEBUG
 AM_CFLAGS = -g -Wall -D_GNU_SOURCE -DDAPL_DBG -DDAT_CONF="\"$(sysconfdir)/dat.conf\""
 else

diff --git a/configure.in b/configure.in
index d056c7b173de23c6edc9bc1be47c6613157c34d3..6ff7ada0a9c1f161648a6b45d75b89ef0bef38cf 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -32,6 +32,13 @@ AC_CHECK_HEADER(infiniband/verbs.h, [],
     AC_MSG_ERROR([<infiniband/verbs.h> not found.  Is libibverbs installed?]))
 fi
 
+if test "$disable_libcheck" != "yes"
+then
+AC_CHECK_MEMBER(struct ibv_port_attr.link_layer,
+    AM_CONDITIONAL(DEFINE_ATTR_LINK_LAYER, test "yes" = "yes"),
+    [], [#include <infiniband/verbs.h>])
+fi
+
 AC_CACHE_CHECK(whether ld accepts --version-script, ac_cv_version_script,
     if test -n "`$LD --help < /dev/null 2>/dev/null | grep version-script`"; then
         ac_cv_version_script=yes

diff --git a/dapl/openib_scm/dapl_ib_util.c b/dapl/openib_scm/dapl_ib_util.c
index 9fb62a59e842a27f9123f5dcebe557feaa69c4db..0661e0db99a43596e79f41cd73800f2e805103b2 100644 (file)
--- a/dapl/openib_scm/dapl_ib_util.c
+++ b/dapl/openib_scm/dapl_ib_util.c
@@ -471,6 +471,14 @@ DAT_RETURN dapls_ib_query_hca (
                                                             hca_ptr->ib_trans.ack_timer);
                hca_ptr->ib_trans.mtu             = DAPL_MIN(port_attr.active_mtu,
                                                             hca_ptr->ib_trans.mtu);
+#ifdef DEFINE_ATTR_LINK_LAYER
+                if (port_attr.link_layer == IBV_LINK_LAYER_ETHERNET)
+                        hca_ptr->ib_trans.global = 1;
+
+                dapl_log(DAPL_DBG_TYPE_UTIL,
+                         " query_hca: port.link_layer = 0x%x\n",
+                         port_attr.link_layer);
+#endif
                dapl_dbg_log (DAPL_DBG_TYPE_UTIL, 
                        " query_hca: (%x.%x) ep %d ep_q %d evd %d evd_q %d mtu %d\n", 
                        ia_attr->hardware_version_major,