From adec9ed03b9374088bec8c6e9e2dcc9b5c24902f Mon Sep 17 00:00:00 2001 From: James Simmons Date: Wed, 9 May 2012 10:33:24 -0400 Subject: [PATCH] LU-554 lnet: add gnilnd awareness to LNet This allows servers on any network to talk to gnilnd routers. This is 2.1 version of the Oracle 23884 attachment 31892. Change-Id: I96777551b0caa50021ebb32755caaa01623ea97d Signed-off-by: James Simmons Signed-off-by: Wally Wang Reviewed-on: http://review.whamcloud.com/2449 Tested-by: Hudson Reviewed-by: Andreas Dilger Tested-by: Maloo Reviewed-by: Cory Spitz Reviewed-by: Oleg Drokin --- libcfs/include/libcfs/libcfs_private.h | 1 + libcfs/libcfs/nidstrings.c | 7 +++++++ lnet/include/lnet/lib-types.h | 1 + 3 files changed, 9 insertions(+) diff --git a/libcfs/include/libcfs/libcfs_private.h b/libcfs/include/libcfs/libcfs_private.h index 9ccf3bd..f344bd5 100644 --- a/libcfs/include/libcfs/libcfs_private.h +++ b/libcfs/include/libcfs/libcfs_private.h @@ -530,6 +530,7 @@ enum { RALND = 10, VIBLND = 11, MXLND = 12, + GNILND = 13, }; #endif diff --git a/libcfs/libcfs/nidstrings.c b/libcfs/libcfs/nidstrings.c index d5b03ed..562da51 100644 --- a/libcfs/libcfs/nidstrings.c +++ b/libcfs/libcfs/nidstrings.c @@ -206,6 +206,13 @@ static struct netstrfns libcfs_netstrfns[] = { /* .nf_str2addr */ libcfs_num_str2addr, /* .nf_parse_addrlist*/ libcfs_num_parse, /* .nf_match_addr*/ libcfs_num_match}, + {/* .nf_type */ GNILND, + /* .nf_name */ "gni", + /* .nf_modname */ "kgnilnd", + /* .nf_addr2str */ libcfs_decnum_addr2str, + /* .nf_str2addr */ libcfs_num_str2addr, + /* .nf_parse_addrlist*/ libcfs_num_parse, + /* .nf_match_addr*/ libcfs_num_match}, /* placeholder for net0 alias. It MUST BE THE LAST ENTRY */ {/* .nf_type */ -1}, }; diff --git a/lnet/include/lnet/lib-types.h b/lnet/include/lnet/lib-types.h index 91169bd..73aa5db 100644 --- a/lnet/include/lnet/lib-types.h +++ b/lnet/include/lnet/lib-types.h @@ -155,6 +155,7 @@ typedef struct { #define LNET_PROTO_IB_MAGIC 0x0be91b91 #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_MX_MAGIC 0x4d583130 /* 'MX10'! */ -- 1.8.3.1