* Removed support for old (pre open source) QSW installations

diff --git a/lnet/archdep.m4 b/lnet/archdep.m4
index 4c9e5ae..e955c33 100644 (file)
--- a/lnet/archdep.m4
+++ b/lnet/archdep.m4
@@ -262,21 +262,6 @@ if test -d $LINUX/drivers/net/qsnet ; then
        with_quadrics="-I$LINUX/drivers/net/qsnet/include"
   fi
   :
-elif test -d $LINUX/drivers/qsnet1 ; then
-  AC_MSG_RESULT(yes)
-  QSWNAL="qswnal"
-  with_quadrics="-I$LINUX/drivers/qsnet1/include -DPROPRIETARY_ELAN"
-  :
-elif test -d $LINUX/drivers/quadrics ; then
-  AC_MSG_RESULT(yes)
-  QSWNAL="qswnal"
-  with_quadrics="-I$LINUX/drivers/quadrics/include -DPROPRIETARY_ELAN"
-  :
-#elif test -d /usr/include/elan3 ; then
-#  AC_MSG_RESULT(yes)
-#  QSWNAL="qswnal"
-#  with_quadrics=""
-#  :
 else
   AC_MSG_RESULT(no)
   QSWNAL=""

diff --git a/lnet/klnds/qswlnd/qswlnd.h b/lnet/klnds/qswlnd/qswlnd.h
index ff3fdfe..a5d5124 100644 (file)
--- a/lnet/klnds/qswlnd/qswlnd.h
+++ b/lnet/klnds/qswlnd/qswlnd.h
@@ -28,12 +28,7 @@
 # define EXPORT_SYMTAB
 #endif
 
-#ifdef PROPRIETARY_ELAN
-# include <qsw/kernel.h>
-#else
-# include <qsnet/kernel.h>
-#endif
-
+#include <qsnet/kernel.h>
 #undef printf                                   /* nasty QSW #define */
 
 #include <linux/config.h>

diff --git a/lustre/portals/archdep.m4 b/lustre/portals/archdep.m4
index 4c9e5ae..e955c33 100644 (file)
--- a/lustre/portals/archdep.m4
+++ b/lustre/portals/archdep.m4
@@ -262,21 +262,6 @@ if test -d $LINUX/drivers/net/qsnet ; then
        with_quadrics="-I$LINUX/drivers/net/qsnet/include"
   fi
   :
-elif test -d $LINUX/drivers/qsnet1 ; then
-  AC_MSG_RESULT(yes)
-  QSWNAL="qswnal"
-  with_quadrics="-I$LINUX/drivers/qsnet1/include -DPROPRIETARY_ELAN"
-  :
-elif test -d $LINUX/drivers/quadrics ; then
-  AC_MSG_RESULT(yes)
-  QSWNAL="qswnal"
-  with_quadrics="-I$LINUX/drivers/quadrics/include -DPROPRIETARY_ELAN"
-  :
-#elif test -d /usr/include/elan3 ; then
-#  AC_MSG_RESULT(yes)
-#  QSWNAL="qswnal"
-#  with_quadrics=""
-#  :
 else
   AC_MSG_RESULT(no)
   QSWNAL=""

diff --git a/lustre/portals/knals/qswnal/qswnal.h b/lustre/portals/knals/qswnal/qswnal.h
index ff3fdfe..a5d5124 100644 (file)
--- a/lustre/portals/knals/qswnal/qswnal.h
+++ b/lustre/portals/knals/qswnal/qswnal.h
@@ -28,12 +28,7 @@
 # define EXPORT_SYMTAB
 #endif
 
-#ifdef PROPRIETARY_ELAN
-# include <qsw/kernel.h>
-#else
-# include <qsnet/kernel.h>
-#endif
-
+#include <qsnet/kernel.h>
 #undef printf                                   /* nasty QSW #define */
 
 #include <linux/config.h>