From b799e13b2e46799c0440808ac5eb66ceeba0af8c Mon Sep 17 00:00:00 2001 From: eeb <eeb> Date: Thu, 5 Feb 2004 11:51:17 +0000 Subject: [PATCH] * Removed support for old (pre open source) QSW installations --- lnet/archdep.m4 | 15 --------------- lnet/klnds/qswlnd/qswlnd.h | 7 +------ lustre/portals/archdep.m4 | 15 --------------- lustre/portals/knals/qswnal/qswnal.h | 7 +------ 4 files changed, 2 insertions(+), 42 deletions(-) diff --git a/lnet/archdep.m4 b/lnet/archdep.m4 index 4c9e5ae248..e955c3388f 100644 --- 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 ff3fdfedb2..a5d512465e 100644 --- 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 4c9e5ae248..e955c3388f 100644 --- 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 ff3fdfedb2..a5d512465e 100644 --- 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> -- GitLab