LU-554 LNet: add gnilnd awareness to LNet

This allows servers on any network to talk to gnilnd routers.
See Oracle 23884 attachment 31892

Change-Id: I6989c987b2bd0d60058a290567f8ef0bee56420b
Signed-off-by: Chris Horn <hornc@cray.com>
Reviewed-on: http://review.whamcloud.com/1179
Reviewed-by: James Simmons <uja.ornl@gmail.com>
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Johann Lombardi <johann@whamcloud.com>

diff --git a/lnet/include/libcfs/kp30.h b/lnet/include/libcfs/kp30.h
index a095684..9ce8036 100644 (file)
--- a/lnet/include/libcfs/kp30.h
+++ b/lnet/include/libcfs/kp30.h
@@ -617,6 +617,7 @@ enum {
         RALND     = 10,
         VIBLND    = 11,
         MXLND     = 12,
+        GNILND    = 13,
 };
 
 enum {

diff --git a/lnet/include/lnet/lib-types.h b/lnet/include/lnet/lib-types.h
index 9698532..744b723 100644 (file)
--- a/lnet/include/lnet/lib-types.h
+++ b/lnet/include/lnet/lib-types.h
@@ -159,6 +159,7 @@ typedef struct {
 #define LNET_PROTO_VIB_MAGIC                LNET_PROTO_IB_MAGIC
 #define LNET_PROTO_RA_MAGIC                 0x0be91b92
 #define LNET_PROTO_QSW_MAGIC                0x0be91b93
+#define LNET_PROTO_GNI_MAGIC                0xb00fbabe /* ask Kim */
 #define LNET_PROTO_TCP_MAGIC                0xeebc0ded
 #define LNET_PROTO_PTL_MAGIC                0x50746C4E /* 'PtlN' unique magic */
 #define LNET_PROTO_GM_MAGIC                 0x6d797269 /* 'myri'! */

diff --git a/lnet/libcfs/nidstrings.c b/lnet/libcfs/nidstrings.c
index 52e3363..4e514c0 100644 (file)
--- a/lnet/libcfs/nidstrings.c
+++ b/lnet/libcfs/nidstrings.c
@@ -175,6 +175,11 @@ static struct netstrfns  libcfs_netstrfns[] = {
          /* .nf_modname   */  "kptllnd",
          /* .nf_addr2str  */  libcfs_decnum_addr2str,
          /* .nf_str2addr  */  libcfs_num_str2addr},
+        {/* .nf_type      */  GNILND,
+         /* .nf_name      */  "gni",
+         /* .nf_modname   */  "kgnilnd",
+         /* .nf_addr2str  */  libcfs_decnum_addr2str,
+         /* .nf_str2addr  */  libcfs_num_str2addr},
         /* placeholder for net0 alias.  It MUST BE THE LAST ENTRY */
         {/* .nf_type      */  -1},
 };