LU-8401 lnet: remove dependency on OFED headers from lnet

[fs/lustre-release.git] / lnet / autoconf / lustre-lnet.m4

diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4
index bef6231..47a4ff1 100644 (file)
--- a/lnet/autoconf/lustre-lnet.m4
+++ b/lnet/autoconf/lustre-lnet.m4
@@ -340,6 +340,7 @@ AC_SUBST(ENABLEO2IB)
 
 AS_IF([test $ENABLEO2IB != "no"], [
        EXTRA_CHECK_INCLUDE="$EXTRA_OFED_CONFIG $EXTRA_OFED_INCLUDE"
+
        # In RHEL 6.2, rdma_create_id() takes the queue-pair type as a fourth argument
        LB_CHECK_COMPILE([if 'rdma_create_id' wants four args],
        rdma_create_id_4args, [
@@ -492,6 +493,26 @@ AS_IF([test $ENABLEO2IB != "no"], [
                AC_DEFINE(HAVE_IB_DEVICE_ATTRS, 1,
                        [struct ib_device.attrs is defined])
        ])
+
+       LB_CHECK_COMPILE([if function 'ib_inc_rkey' is defined],
+       ib_inc_rkey, [
+               #ifdef HAVE_COMPAT_RDMA
+               #undef PACKAGE_NAME
+               #undef PACKAGE_TARNAME
+               #undef PACKAGE_VERSION
+               #undef PACKAGE_STRING
+               #undef PACKAGE_BUGREPORT
+               #undef PACKAGE_URL
+               #include <linux/compat-2.6.h>
+               #endif
+               #include <rdma/ib_verbs.h>
+       ],[
+               (void)ib_inc_rkey(0);
+       ],[
+               AC_DEFINE(HAVE_IB_INC_RKEY, 1,
+                         [function ib_inc_rkey exist])
+       ])
+
        EXTRA_CHECK_INCLUDE=""
 ]) # ENABLEO2IB != "no"
 ]) # LN_CONFIG_O2IB
@@ -564,15 +585,6 @@ AC_SUBST(GNILND)
 AC_DEFUN([LN_CONFIG_SK_SLEEP], [
 LB_CHECK_COMPILE([if Linux kernel has 'sk_sleep'],
 sk_sleep, [
-       #ifdef HAVE_COMPAT_RDMA
-       #undef PACKAGE_NAME
-       #undef PACKAGE_TARNAME
-       #undef PACKAGE_VERSION
-       #undef PACKAGE_STRING
-       #undef PACKAGE_BUGREPORT
-       #undef PACKAGE_URL
-       #include <linux/compat-2.6.h>
-       #endif
        #include <net/sock.h>
 ],[
        sk_sleep(NULL);
@@ -585,22 +597,14 @@ sk_sleep, [
 #
 # LN_CONFIG_TCP_SENDPAGE
 #
-# 2.6.36 tcp_sendpage() first parameter is 'struct sock' instead of 'struct socket'.
+# 2.6.36 tcp_sendpage() first parameter is 'struct sock'
+# instead of 'struct socket'.
 #
 AC_DEFUN([LN_CONFIG_TCP_SENDPAGE], [
 tmp_flags="$EXTRA_KCFLAGS"
 EXTRA_KCFLAGS="-Werror"
 LB_CHECK_COMPILE([if 'tcp_sendpage' first parameter is socket],
 tcp_sendpage_socket, [
-       #ifdef HAVE_COMPAT_RDMA
-       #undef PACKAGE_NAME
-       #undef PACKAGE_TARNAME
-       #undef PACKAGE_VERSION
-       #undef PACKAGE_STRING
-       #undef PACKAGE_BUGREPORT
-       #undef PACKAGE_URL
-       #include <linux/compat-2.6.h>
-       #endif
        #include <linux/net.h>
        #include <net/tcp.h>
 ],[
@@ -622,15 +626,6 @@ tmp_flags="$EXTRA_KCFLAGS"
 EXTRA_KCFLAGS="-Werror"
 LB_CHECK_COMPILE([if 'sk_data_ready' takes only one argument],
 sk_data_ready, [
-       #ifdef HAVE_COMPAT_RDMA
-       #undef PACKAGE_NAME
-       #undef PACKAGE_TARNAME
-       #undef PACKAGE_VERSION
-       #undef PACKAGE_STRING
-       #undef PACKAGE_BUGREPORT
-       #undef PACKAGE_URL
-       #include <linux/compat-2.6.h>
-       #endif
        #include <linux/net.h>
        #include <net/sock.h>
 ],[
@@ -643,33 +638,6 @@ EXTRA_KCFLAGS="$tmp_flags"
 ]) # LN_CONFIG_SK_DATA_READY
 
 #
-# LN_CONFIG_IB_INC_RKEY
-#
-AC_DEFUN([LN_CONFIG_IB_INC_RKEY], [
-tmp_flags="$EXTRA_KCFLAGS"
-EXTRA_KCFLAGS="-Werror"
-LB_CHECK_COMPILE([if function 'ib_inc_rkey' is defined],
-ib_inc_rkey, [
-       #ifdef HAVE_COMPAT_RDMA
-       #undef PACKAGE_NAME
-       #undef PACKAGE_TARNAME
-       #undef PACKAGE_VERSION
-       #undef PACKAGE_STRING
-       #undef PACKAGE_BUGREPORT
-       #undef PACKAGE_URL
-       #include <linux/compat-2.6.h>
-       #endif
-       #include <rdma/ib_verbs.h>
-],[
-       (void)ib_inc_rkey(0);
-],[
-       AC_DEFINE(HAVE_IB_INC_RKEY, 1,
-                 [function ib_inc_rkey exist])
-])
-EXTRA_KCFLAGS="$tmp_flags"
-]) # LN_CONFIG_IB_INC_RKEY
-
-#
 # LN_PROG_LINUX
 #
 # LNet linux kernel checks
@@ -682,18 +650,12 @@ LN_CONFIG_AFFINITY
 LN_CONFIG_BACKOFF
 LN_CONFIG_O2IB
 LN_CONFIG_GNILND
-# OFED checks, so add extra OFED include
-EXTRA_CHECK_INCLUDE="$EXTRA_OFED_CONFIG $EXTRA_OFED_INCLUDE"
 # 2.6.35
 LN_CONFIG_SK_SLEEP
 # 2.6.36
 LN_CONFIG_TCP_SENDPAGE
-# 3.8.1
-LN_CONFIG_IB_INC_RKEY
 # 3.15
 LN_CONFIG_SK_DATA_READY
-# remove extra include for none OFED code
-EXTRA_CHECK_INCLUDE=""
 ]) # LN_PROG_LINUX
 
 #