X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=libcfs%2Flibcfs%2Futil%2Fnidstrings.c;h=18fcae2a70f29cd752550394514adaa0e593cd59;hp=8c4e4956746d6e6c0e5687017c633eb5d9e10bf9;hb=ce8735993473c1055038f7422350c96b092d707d;hpb=1bec033e97d8868b8d31ecc61b4e3ca0d1697d14

diff --git a/libcfs/libcfs/util/nidstrings.c b/libcfs/libcfs/util/nidstrings.c
index 8c4e495..18fcae2 100644
--- a/libcfs/libcfs/util/nidstrings.c
+++ b/libcfs/libcfs/util/nidstrings.c
@@ -232,12 +232,6 @@ libcfs_decnum_addr2str(__u32 addr, char *str, size_t size)
 	snprintf(str, size, "%u", addr);
 }
 
-static void
-libcfs_hexnum_addr2str(__u32 addr, char *str, size_t size)
-{
-	snprintf(str, size, "0x%x", addr);
-}
-
 static int
 libcfs_num_str2addr(const char *str, int nob, __u32 *addr)
 {
@@ -352,114 +346,6 @@ static struct netstrfns libcfs_netstrfns[] = {
 		.nf_min_max		= cfs_ip_min_max
 	},
 	{
-		.nf_type		= CIBLND,
-		.nf_name		= "cib",
-		.nf_modname		= "kciblnd",
-		.nf_addr2str		= libcfs_ip_addr2str,
-		.nf_str2addr		= libcfs_ip_str2addr,
-		.nf_parse_addrlist	= cfs_ip_addr_parse,
-		.nf_print_addrlist	= libcfs_ip_addr_range_print,
-		.nf_match_addr		= cfs_ip_addr_match,
-		.nf_is_contiguous	= cfs_ip_is_contiguous,
-		.nf_min_max		= cfs_ip_min_max
-	},
-	{
-		.nf_type		= OPENIBLND,
-		.nf_name		= "openib",
-		.nf_modname		= "kopeniblnd",
-		.nf_addr2str		= libcfs_ip_addr2str,
-		.nf_str2addr		= libcfs_ip_str2addr,
-		.nf_parse_addrlist	= cfs_ip_addr_parse,
-		.nf_print_addrlist	= libcfs_ip_addr_range_print,
-		.nf_match_addr		= cfs_ip_addr_match,
-		.nf_is_contiguous	= cfs_ip_is_contiguous,
-		.nf_min_max		= cfs_ip_min_max
-	},
-	{
-		.nf_type		= IIBLND,
-		.nf_name		= "iib",
-		.nf_modname		= "kiiblnd",
-		.nf_addr2str		= libcfs_ip_addr2str,
-		.nf_str2addr		= libcfs_ip_str2addr,
-		.nf_parse_addrlist	= cfs_ip_addr_parse,
-		.nf_print_addrlist	= libcfs_ip_addr_range_print,
-		.nf_match_addr		= cfs_ip_addr_match,
-		.nf_is_contiguous	= cfs_ip_is_contiguous,
-		.nf_min_max		= cfs_ip_min_max
-	},
-	{
-		.nf_type		= VIBLND,
-		.nf_name		= "vib",
-		.nf_modname		= "kviblnd",
-		.nf_addr2str		= libcfs_ip_addr2str,
-		.nf_str2addr		= libcfs_ip_str2addr,
-		.nf_parse_addrlist	= cfs_ip_addr_parse,
-		.nf_print_addrlist	= libcfs_ip_addr_range_print,
-		.nf_match_addr		= cfs_ip_addr_match,
-		.nf_is_contiguous	= cfs_ip_is_contiguous,
-		.nf_min_max		= cfs_ip_min_max
-	},
-	{
-		.nf_type		= RALND,
-		.nf_name		= "ra",
-		.nf_modname		= "kralnd",
-		.nf_addr2str		= libcfs_ip_addr2str,
-		.nf_str2addr		= libcfs_ip_str2addr,
-		.nf_parse_addrlist	= cfs_ip_addr_parse,
-		.nf_print_addrlist	= libcfs_ip_addr_range_print,
-		.nf_match_addr		= cfs_ip_addr_match,
-		.nf_is_contiguous	= cfs_ip_is_contiguous,
-		.nf_min_max		= cfs_ip_min_max
-	},
-	{
-		.nf_type		= QSWLND,
-		.nf_name		= "elan",
-		.nf_modname		= "kqswlnd",
-		.nf_addr2str		= libcfs_decnum_addr2str,
-		.nf_str2addr		= libcfs_num_str2addr,
-		.nf_parse_addrlist	= libcfs_num_parse,
-		.nf_print_addrlist	= libcfs_num_addr_range_print,
-		.nf_match_addr		= libcfs_num_match,
-		.nf_is_contiguous	= cfs_num_is_contiguous,
-		.nf_min_max		= cfs_num_min_max
-	},
-	{
-		.nf_type		= GMLND,
-		.nf_name		= "gm",
-		.nf_modname		= "kgmlnd",
-		.nf_addr2str		= libcfs_hexnum_addr2str,
-		.nf_str2addr		= libcfs_num_str2addr,
-		.nf_parse_addrlist	= libcfs_num_parse,
-		.nf_print_addrlist	= libcfs_num_addr_range_print,
-		.nf_match_addr		= libcfs_num_match,
-		.nf_is_contiguous	= cfs_num_is_contiguous,
-		.nf_min_max		= cfs_num_min_max
-	},
-	{
-		.nf_type		= MXLND,
-		.nf_name		= "mx",
-		.nf_modname		= "kmxlnd",
-		.nf_addr2str		= libcfs_ip_addr2str,
-		.nf_str2addr		= libcfs_ip_str2addr,
-		.nf_parse_addrlist	= cfs_ip_addr_parse,
-		.nf_print_addrlist	= libcfs_ip_addr_range_print,
-		.nf_match_addr		= cfs_ip_addr_match,
-		.nf_is_contiguous	= cfs_ip_is_contiguous,
-		.nf_min_max		= cfs_ip_min_max
-	},
-	{
-		.nf_type		= PTLLND,
-		.nf_name		= "ptl",
-		.nf_modname		= "kptllnd",
-		.nf_addr2str		= libcfs_decnum_addr2str,
-		.nf_str2addr		= libcfs_num_str2addr,
-		.nf_parse_addrlist	= libcfs_num_parse,
-		.nf_print_addrlist	= libcfs_num_addr_range_print,
-		.nf_match_addr		= libcfs_num_match,
-		.nf_is_contiguous	= cfs_num_is_contiguous,
-		.nf_min_max		= cfs_num_min_max
-	},
-	{
 		.nf_type		= GNILND,
 		.nf_name		= "gni",
 		.nf_modname		= "kgnilnd",