LU-8769 lnet: removal of obsolete LNDs

[fs/lustre-release.git] / libcfs / libcfs / util / nidstrings.c

diff --git a/libcfs/libcfs/util/nidstrings.c b/libcfs/libcfs/util/nidstrings.c
index 6dae2a5..18fcae2 100644 (file)
--- 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,69 +346,9 @@ 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_type                = GNILND,
+               .nf_name                = "gni",
+               .nf_modname             = "kgnilnd",
                .nf_addr2str            = libcfs_decnum_addr2str,
                .nf_str2addr            = libcfs_num_str2addr,
                .nf_parse_addrlist      = libcfs_num_parse,
@@ -424,21 +358,9 @@ static struct netstrfns libcfs_netstrfns[] = {
                .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_type                = GNIIPLND,
+               .nf_name                = "gip",
+               .nf_modname             = "kgnilnd",
                .nf_addr2str            = libcfs_ip_addr2str,
                .nf_str2addr            = libcfs_ip_str2addr,
                .nf_parse_addrlist      = cfs_ip_addr_parse,
@@ -448,9 +370,9 @@ static struct netstrfns libcfs_netstrfns[] = {
                .nf_min_max             = cfs_ip_min_max
        },
        {
-               .nf_type                = PTLLND,
-               .nf_name                = "ptl",
-               .nf_modname             = "kptllnd",
+               .nf_type                = PTL4LND,
+               .nf_name                = "ptlf",
+               .nf_modname             = "kptl4lnd",
                .nf_addr2str            = libcfs_decnum_addr2str,
                .nf_str2addr            = libcfs_num_str2addr,
                .nf_parse_addrlist      = libcfs_num_parse,
@@ -458,30 +380,6 @@ static struct netstrfns libcfs_netstrfns[] = {
                .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",
-               .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                = GNIIPLND,
-               .nf_name                = "gip",
-               .nf_modname             = "kgnilnd",
-               .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
        }
 };