* Changed qswnal.h to expect more recent QSW headers (it had a

    work-around for missing #defines that are now in the QSW release).

diff --git a/lnet/klnds/qswlnd/qswlnd.h b/lnet/klnds/qswlnd/qswlnd.h
index 3e4274b..ff3fdfe 100644 (file)
--- a/lnet/klnds/qswlnd/qswlnd.h
+++ b/lnet/klnds/qswlnd/qswlnd.h
@@ -317,13 +317,8 @@ static inline void kqswnal_rx_done (kqswnal_rx_t *krx)
 
 #if MULTIRAIL_EKC
 
-#if (!defined(EP_RAILMASK_ALL) && !defined(EP_SHUTDOWN))
-/* These are making their way into the EKC subsystem.... */
-# define EP_RAILMASK_ALL    0xFFFF
-# define EP_SHUTDOWN        EP_ABORT
-#else
-/* ...Oh! they've got there already! */
-# error "qswnal.h older than EKC headers"
+#ifndef EP_RAILMASK_ALL
+# error "old (unsupported) version of EKC headers"
 #endif
 
 static inline int

diff --git a/lustre/portals/knals/qswnal/qswnal.h b/lustre/portals/knals/qswnal/qswnal.h
index 3e4274b..ff3fdfe 100644 (file)
--- a/lustre/portals/knals/qswnal/qswnal.h
+++ b/lustre/portals/knals/qswnal/qswnal.h
@@ -317,13 +317,8 @@ static inline void kqswnal_rx_done (kqswnal_rx_t *krx)
 
 #if MULTIRAIL_EKC
 
-#if (!defined(EP_RAILMASK_ALL) && !defined(EP_SHUTDOWN))
-/* These are making their way into the EKC subsystem.... */
-# define EP_RAILMASK_ALL    0xFFFF
-# define EP_SHUTDOWN        EP_ABORT
-#else
-/* ...Oh! they've got there already! */
-# error "qswnal.h older than EKC headers"
+#ifndef EP_RAILMASK_ALL
+# error "old (unsupported) version of EKC headers"
 #endif
 
 static inline int