LU-8943 lnd: Enable Multiple OPA Endpoints between Nodes

[fs/lustre-release.git] / lnet / include / lnet / nidstr.h

diff --git a/lnet/include/lnet/nidstr.h b/lnet/include/lnet/nidstr.h
index a0ed3e6..b90e320 100644 (file)
--- a/lnet/include/lnet/nidstr.h
+++ b/lnet/include/lnet/nidstr.h
@@ -23,7 +23,7 @@
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2014, Intel Corporation.
+ * Copyright (c) 2014, 2015, Intel Corporation.
  */
 #ifndef _LNET_NIDSTRINGS_H
 #define _LNET_NIDSTRINGS_H
@@ -35,26 +35,27 @@
 enum {
        /* Only add to these values (i.e. don't ever change or redefine them):
         * network addresses depend on them... */
-       QSWLND          = 1,
+       /*QSWLND        = 1, removed v2_7_50                 */
        SOCKLND         = 2,
-       GMLND           = 3,
-       PTLLND          = 4,
+       /*GMLND         = 3, removed v2_0_0-rc1a-16-gc660aac */
+       /*PTLLND        = 4, removed v2_7_50                 */
        O2IBLND         = 5,
-       CIBLND          = 6,
-       OPENIBLND       = 7,
-       IIBLND          = 8,
+       /*CIBLND        = 6, removed v2_0_0-rc1a-175-gd2b8a0e */
+       /*OPENIBLND     = 7, removed v2_0_0-rc1a-175-gd2b8a0e */
+       /*IIBLND        = 8, removed v2_0_0-rc1a-175-gd2b8a0e */
        LOLND           = 9,
-       RALND           = 10,
-       VIBLND          = 11,
-       MXLND           = 12,
+       /*RALND         = 10, removed v2_7_50_0-34-g8be9e41    */
+       /*VIBLND        = 11, removed v2_0_0-rc1a-175-gd2b8a0e */
+       /*MXLND         = 12, removed v2_7_50_0-34-g8be9e41    */
        GNILND          = 13,
        GNIIPLND        = 14,
+       PTL4LND         = 15,
 };
 
 struct list_head;
 
-#define LNET_NIDSTR_COUNT  1024    /* # of nidstrings */
-#define LNET_NIDSTR_SIZE   32      /* size of each one (see below for usage) */
+#define LNET_NIDSTR_COUNT 1024 /* # of nidstrings */
+#define LNET_NIDSTR_SIZE  32   /* size of each one (see below for usage) */
 
 /* support decl needed by both kernel and user space */
 char *libcfs_next_nidstring(void);
@@ -82,11 +83,14 @@ static inline char *libcfs_nid2str(lnet_nid_t nid)
 __u32 libcfs_str2net(const char *str);
 lnet_nid_t libcfs_str2nid(const char *str);
 int libcfs_str2anynid(lnet_nid_t *nid, const char *str);
-char *libcfs_id2str(lnet_process_id_t id);
+char *libcfs_id2str(struct lnet_process_id id);
 void cfs_free_nidlist(struct list_head *list);
 int cfs_parse_nidlist(char *str, int len, struct list_head *list);
 int cfs_print_nidlist(char *buffer, int count, struct list_head *list);
 int cfs_match_nid(lnet_nid_t nid, struct list_head *list);
+
+int cfs_ip_addr_parse(char *str, int len, struct list_head *list);
+int cfs_ip_addr_match(__u32 addr, struct list_head *list);
 bool cfs_nidrange_is_contiguous(struct list_head *nidlist);
 void cfs_nidrange_find_min_max(struct list_head *nidlist, char *min_nid,
                               char *max_nid, size_t nidstr_length);