From 4779ee59900e41f2d61a56441cce6ac1ff5b6072 Mon Sep 17 00:00:00 2001
From: brian <brian>
Date: Thu, 8 May 2008 14:01:15 +0000
Subject: [PATCH] b=15316 i=cliffw i=wangyb

Forgot that b_release_* branches branch all modules and erroneously
omitted the lnet portion of the patch.
---
 lnet/autoconf/lustre-lnet.m4   | 12 +++++++++++-
 lnet/klnds/o2iblnd/Makefile.in |  4 +++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4
index 4a47927..2166980 100644
--- a/lnet/autoconf/lustre-lnet.m4
+++ b/lnet/autoconf/lustre-lnet.m4
@@ -577,6 +577,16 @@ else
 		        O2IBCPPFLAGS=""
 		])
 
+		# we know at this point that the found OFED source is good
+		if test \( $ENABLEO2IB = 3 \); then
+			if test \( -f $O2IBPATH/Module.symvers \); then
+				AC_MSG_NOTICE([adding $O2IBPATH/Module.symvers to $PWD/Module.symvers])
+				cat $O2IBPATH/Module.symvers >> $PWD/Module.symvers
+			else
+				AC_MSG_ERROR([an external source tree was specified for o2iblnd however I could not find a $O2IBPATH/Module.symvers there])
+			fi
+		fi
+
 		# version checking is a hack and isn't reliable,
 		# we need verify it with each new ofed release
 
@@ -631,7 +641,7 @@ AC_ARG_WITH([openib],
 if test $ENABLEOPENIB -eq 0; then
 	AC_MSG_RESULT([disabled])
 elif test ! \( -f ${OPENIBPATH}/include/ts_ib_core.h -a \
-               -f ${OPENIBPATH}/include/ts_ib_cm.h -a\
+               -f ${OPENIBPATH}/include/ts_ib_cm.h -a \
 	       -f ${OPENIBPATH}/include/ts_ib_sa_client.h \); then
 	AC_MSG_RESULT([no])
 	case $ENABLEOPENIB in
diff --git a/lnet/klnds/o2iblnd/Makefile.in b/lnet/klnds/o2iblnd/Makefile.in
index 52a194d..569c266 100644
--- a/lnet/klnds/o2iblnd/Makefile.in
+++ b/lnet/klnds/o2iblnd/Makefile.in
@@ -1,6 +1,8 @@
 MODULES := ko2iblnd
 ko2iblnd-objs := o2iblnd.o o2iblnd_cb.o o2iblnd_modparams.o
 
-EXTRA_POST_CFLAGS := @O2IBCPPFLAGS@
+# Need to make sure we use PRE, not POST here so that an external OFED
+# source pool overrides any in-kernel OFED sources
+EXTRA_PRE_CFLAGS := @O2IBCPPFLAGS@
 
 @INCLUDE_RULES@
-- 
1.8.3.1