- landing of b_hd_cleanup_merge to HEAD.

[fs/lustre-release.git] / lnet / ulnds / socklnd / bridge.h

diff --git a/lnet/ulnds/socklnd/bridge.h b/lnet/ulnds/socklnd/bridge.h
index 0b4940f..d2f0f2c 100644 (file)
--- a/lnet/ulnds/socklnd/bridge.h
+++ b/lnet/ulnds/socklnd/bridge.h
@@ -6,11 +6,20 @@
  *   This file is part of Portals, http://www.sf.net/projects/sandiaportals/
  */
 
+#ifndef TCPNAL_PROCBRIDGE_H
+#define TCPNAL_PROCBRIDGE_H
+
 #include <portals/lib-p30.h>
+#include <portals/nal.h>
+
+#define PTL_IFACE_TCP 1
+#define PTL_IFACE_ER 2
+#define PTL_IFACE_SS 3
+#define PTL_IFACE_MAX 4
 
 typedef struct bridge {
     int alive;
-    nal_cb_t *nal_cb;
+    lib_nal_t *lib_nal;
     void *lower;
     void *local;
     void (*shutdown)(struct bridge *);
@@ -19,11 +28,7 @@ typedef struct bridge {
 } *bridge;
 
 
-nal_t *bridge_init(ptl_interface_t nal,
-                   ptl_pid_t pid_request,
-                   ptl_ni_limits_t *desired,
-                   ptl_ni_limits_t *actual,
-                   int *rc);
-
 typedef int (*nal_initialize)(bridge);
 extern nal_initialize nal_table[PTL_IFACE_MAX];
+
+#endif