[ofa-general] [infiniband-diags] [PATCH] [2/5] libibnetdisc cleanup patches

Al Chu chu11 at llnl.gov
Tue Jul 7 15:24:41 PDT 2009


Rename internal libibnetdisc structs with _int suffix to differentiate
code more cleanly against public structs.

Al

-- 
Albert Chu
chu11 at llnl.gov
Computer Scientist
High Performance Systems Division
Lawrence Livermore National Laboratory
-------------- next part --------------
>From 0f2dba86d84bd96f7a24297c6fc2634f97d54f35 Mon Sep 17 00:00:00 2001
From: Albert Chu <chu11 at llnl.gov>
Date: Tue, 7 Jul 2009 11:18:05 -0700
Subject: [PATCH] Rename internal libibnetdisc structs with _int suffix to differentiate code more cleanly against public structs.

Signed-off-by: Albert Chu <chu11 at llnl.gov>
Signed-off-by: Ira Weiny <weiny2 at llnl.gov>
---
 infiniband-diags/libibnetdisc/src/chassis.c   |   48 +++++++-------
 infiniband-diags/libibnetdisc/src/chassis.h   |    2 +-
 infiniband-diags/libibnetdisc/src/ibnetdisc.c |   92 ++++++++++++------------
 infiniband-diags/libibnetdisc/src/internal.h  |   32 ++++----
 4 files changed, 87 insertions(+), 87 deletions(-)

diff --git a/infiniband-diags/libibnetdisc/src/chassis.c b/infiniband-diags/libibnetdisc/src/chassis.c
index 78aee1f..bec24bc 100644
--- a/infiniband-diags/libibnetdisc/src/chassis.c
+++ b/infiniband-diags/libibnetdisc/src/chassis.c
@@ -84,7 +84,7 @@ char *ibnd_get_chassis_slot_str(ibnd_node_t *node, char *str, size_t size)
 	return (str);
 }
 
-static ibnd_chassis_t *find_chassisnum(struct ibnd_fabric *fabric, unsigned char chassisnum)
+static ibnd_chassis_t *find_chassisnum(struct ibnd_fabric_int *fabric, unsigned char chassisnum)
 {
 	ibnd_chassis_t *current;
 
@@ -197,7 +197,7 @@ static uint64_t get_chassisguid(ibnd_node_t *node)
 		return sysimgguid;
 }
 
-static ibnd_chassis_t *find_chassisguid(struct ibnd_fabric *f, ibnd_node_t *node)
+static ibnd_chassis_t *find_chassisguid(struct ibnd_fabric_int *f, ibnd_node_t *node)
 {
 	ibnd_chassis_t *current;
 	uint64_t chguid;
@@ -213,7 +213,7 @@ static ibnd_chassis_t *find_chassisguid(struct ibnd_fabric *f, ibnd_node_t *node
 
 uint64_t ibnd_get_chassis_guid(ibnd_fabric_t *fabric, unsigned char chassisnum)
 {
-	struct ibnd_fabric *f = CONV_FABRIC_INTERNAL(fabric);
+	struct ibnd_fabric_int *f = CONV_FABRIC_INTERNAL(fabric);
 	ibnd_chassis_t *chassis;
 
 	chassis = find_chassisnum(f, chassisnum);
@@ -223,46 +223,46 @@ uint64_t ibnd_get_chassis_guid(ibnd_fabric_t *fabric, unsigned char chassisnum)
 		return 0;
 }
 
-static int is_router(struct ibnd_node *n)
+static int is_router(struct ibnd_node_int *n)
 {
 	uint32_t devid = mad_get_field(n->node.info, 0, IB_NODE_DEVID_F);
 	return (devid == VTR_DEVID_IB_FC_ROUTER ||
 		devid == VTR_DEVID_IB_IP_ROUTER);
 }
 
-static int is_spine_9096(struct ibnd_node *n)
+static int is_spine_9096(struct ibnd_node_int *n)
 {
 	uint32_t devid = mad_get_field(n->node.info, 0, IB_NODE_DEVID_F);
 	return (devid == VTR_DEVID_SFB4 ||
 		devid == VTR_DEVID_SFB4_DDR);
 }
 
-static int is_spine_9288(struct ibnd_node *n)
+static int is_spine_9288(struct ibnd_node_int *n)
 {
 	uint32_t devid = mad_get_field(n->node.info, 0, IB_NODE_DEVID_F);
 	return (devid == VTR_DEVID_SFB12 ||
 		devid == VTR_DEVID_SFB12_DDR);
 }
 
-static int is_spine_2004(struct ibnd_node *n)
+static int is_spine_2004(struct ibnd_node_int *n)
 {
 	uint32_t devid = mad_get_field(n->node.info, 0, IB_NODE_DEVID_F);
 	return (devid == VTR_DEVID_SFB2004);
 }
 
-static int is_spine_2012(struct ibnd_node *n)
+static int is_spine_2012(struct ibnd_node_int *n)
 {
 	uint32_t devid = mad_get_field(n->node.info, 0, IB_NODE_DEVID_F);
 	return (devid == VTR_DEVID_SFB2012);
 }
 
-static int is_spine(struct ibnd_node *n)
+static int is_spine(struct ibnd_node_int *n)
 {
 	return (is_spine_9096(n) || is_spine_9288(n) ||
 		is_spine_2004(n) || is_spine_2012(n));
 }
 
-static int is_line_24(struct ibnd_node *n)
+static int is_line_24(struct ibnd_node_int *n)
 {
 	uint32_t devid = mad_get_field(n->node.info, 0, IB_NODE_DEVID_F);
 	return (devid == VTR_DEVID_SLB24 ||
@@ -270,24 +270,24 @@ static int is_line_24(struct ibnd_node *n)
 		devid == VTR_DEVID_SRB2004);
 }
 
-static int is_line_8(struct ibnd_node *n)
+static int is_line_8(struct ibnd_node_int *n)
 {
 	uint32_t devid = mad_get_field(n->node.info, 0, IB_NODE_DEVID_F);
 	return (devid == VTR_DEVID_SLB8);
 }
 
-static int is_line_2024(struct ibnd_node *n)
+static int is_line_2024(struct ibnd_node_int *n)
 {
 	uint32_t devid = mad_get_field(n->node.info, 0, IB_NODE_DEVID_F);
 	return (devid == VTR_DEVID_SLB2024);
 }
 
-static int is_line(struct ibnd_node *n)
+static int is_line(struct ibnd_node_int *n)
 {
 	return (is_line_24(n) || is_line_8(n) || is_line_2024(n));
 }
 
-int is_chassis_switch(struct ibnd_node *n)
+int is_chassis_switch(struct ibnd_node_int *n)
 {
     return (is_spine(n) || is_line(n));
 }
@@ -308,7 +308,7 @@ char spine4_slot_2_slb[25]       = { 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 0, 0
 char anafa_spine4_slot_2_slb[25] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 /*	reference                     { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24 }; */
 
-static void get_sfb_slot(struct ibnd_node *node, ibnd_port_t *lineport)
+static void get_sfb_slot(struct ibnd_node_int *node, ibnd_port_t *lineport)
 {
 	ibnd_node_t *n = (ibnd_node_t *)node;
 
@@ -335,7 +335,7 @@ static void get_sfb_slot(struct ibnd_node *node, ibnd_port_t *lineport)
 	}
 }
 
-static void get_router_slot(struct ibnd_node *node, ibnd_port_t *spineport)
+static void get_router_slot(struct ibnd_node_int *node, ibnd_port_t *spineport)
 {
 	ibnd_node_t *n = (ibnd_node_t *)node;
 	uint64_t guessnum = 0;
@@ -407,12 +407,12 @@ static void voltaire_portmap(ibnd_port_t *port);
 	It could be optimized so, but time overhead is very small
 	and its only diag.util
 */
-static void fill_voltaire_chassis_record(struct ibnd_node *node)
+static void fill_voltaire_chassis_record(struct ibnd_node_int *node)
 {
 	ibnd_node_t *n = (ibnd_node_t *)node;
 	int p = 0;
 	ibnd_port_t *port;
-	struct ibnd_node *remnode = 0;
+	struct ibnd_node_int *remnode = 0;
 
 	if (node->ch_found) /* somehow this node has already been passed */
 		return;
@@ -587,10 +587,10 @@ static void pass_on_spines_interpolate_chguid(ibnd_chassis_t *chassis)
 	in that chassis
 	chassis structure = structure of one standalone chassis
 */
-static void build_chassis(struct ibnd_node *node, ibnd_chassis_t *chassis)
+static void build_chassis(struct ibnd_node_int *node, ibnd_chassis_t *chassis)
 {
 	int p = 0;
-	struct ibnd_node *remnode = 0;
+	struct ibnd_node_int *remnode = 0;
 	ibnd_port_t *port = 0;
 
 	/* we get here with node = chassis_spine */
@@ -684,7 +684,7 @@ int int2ext_map_slb2024[2][25] = {
 static void
 voltaire_portmap(ibnd_port_t *port)
 {
-	struct ibnd_node *n = CONV_NODE_INTERNAL(port->node);
+	struct ibnd_node_int *n = CONV_NODE_INTERNAL(port->node);
 	int portnum = port->portnum;
 	int chipnum = 0;
 	ibnd_node_t *node = port->node;
@@ -709,7 +709,7 @@ voltaire_portmap(ibnd_port_t *port)
 		port->ext_portnum = int2ext_map_slb8[chipnum][portnum];
 }
 
-static void add_chassis(struct ibnd_fabric *fabric)
+static void add_chassis(struct ibnd_fabric_int *fabric)
 {
 	if (!(fabric->current_chassis = calloc(1, sizeof(ibnd_chassis_t))))
 		IBPANIC("out of mem");
@@ -744,9 +744,9 @@ add_node_to_chassis(ibnd_chassis_t *chassis, ibnd_node_t *node)
 	Pointer to the first chassis in a NULL terminated list of chassis in
 	the fabric specified.
 */
-ibnd_chassis_t *group_nodes(struct ibnd_fabric *fabric)
+ibnd_chassis_t *group_nodes(struct ibnd_fabric_int *fabric)
 {
-	struct ibnd_node *node;
+	struct ibnd_node_int *node;
 	int dist;
 	int chassisnum = 0;
 	ibnd_chassis_t *chassis;
diff --git a/infiniband-diags/libibnetdisc/src/chassis.h b/infiniband-diags/libibnetdisc/src/chassis.h
index 16dad49..ca57a78 100644
--- a/infiniband-diags/libibnetdisc/src/chassis.h
+++ b/infiniband-diags/libibnetdisc/src/chassis.h
@@ -80,6 +80,6 @@
 enum ibnd_chassis_type { UNRESOLVED_CT, ISR9288_CT, ISR9096_CT, ISR2012_CT, ISR2004_CT };
 enum ibnd_chassis_slot_type { UNRESOLVED_CS, LINE_CS, SPINE_CS, SRBD_CS };
 
-ibnd_chassis_t *group_nodes(struct ibnd_fabric *fabric);
+ibnd_chassis_t *group_nodes(struct ibnd_fabric_int *fabric);
 
 #endif	/* _CHASSIS_H_ */
diff --git a/infiniband-diags/libibnetdisc/src/ibnetdisc.c b/infiniband-diags/libibnetdisc/src/ibnetdisc.c
index b640bc1..a10dfcd 100644
--- a/infiniband-diags/libibnetdisc/src/ibnetdisc.c
+++ b/infiniband-diags/libibnetdisc/src/ibnetdisc.c
@@ -69,7 +69,7 @@ decode_port_info(ibnd_port_t *port)
 }
 
 static int
-get_port_info(struct ibnd_fabric *fabric, struct ibnd_port *port,
+get_port_info(struct ibnd_fabric_int *fabric, struct ibnd_port_int *port,
 		int portnum, ib_portid_t *portid)
 {
 	char width[64], speed[64];
@@ -99,7 +99,7 @@ get_port_info(struct ibnd_fabric *fabric, struct ibnd_port *port,
  * Returns -1 if error.
  */
 static int
-query_node_info(struct ibnd_fabric *fabric, struct ibnd_node *node, ib_portid_t *portid)
+query_node_info(struct ibnd_fabric_int *fabric, struct ibnd_node_int *node, ib_portid_t *portid)
 {
 	if (!smp_query_via(&(node->node.info), portid, IB_ATTR_NODE_INFO, 0, timeout_ms,
 			fabric->fabric.ibmad_port))
@@ -118,8 +118,8 @@ query_node_info(struct ibnd_fabric *fabric, struct ibnd_node *node, ib_portid_t
  * Returns 0 if non switch node is found, 1 if switch is found, -1 if error.
  */
 static int
-query_node(struct ibnd_fabric *fabric, struct ibnd_node *inode,
-		struct ibnd_port *iport, ib_portid_t *portid)
+query_node(struct ibnd_fabric_int *fabric, struct ibnd_node_int *inode,
+		struct ibnd_port_int *iport, ib_portid_t *portid)
 {
 	ibnd_node_t *node = &(inode->node);
 	ibnd_port_t *port = &(iport->port);
@@ -177,7 +177,7 @@ add_port_to_dpath(ib_dr_path_t *path, int nextport)
 }
 
 static int
-extend_dpath(struct ibnd_fabric *f, ib_portid_t *portid, int nextport)
+extend_dpath(struct ibnd_fabric_int *f, ib_portid_t *portid, int nextport)
 {
 	int rc = 0;
 
@@ -201,7 +201,7 @@ extend_dpath(struct ibnd_fabric *f, ib_portid_t *portid, int nextport)
 
 static void
 dump_endnode(ib_portid_t *path, char *prompt,
-		struct ibnd_node *node, struct ibnd_port *port)
+		struct ibnd_node_int *node, struct ibnd_port_int *port)
 {
 	char type[64];
 	if (!show_progress)
@@ -217,11 +217,11 @@ dump_endnode(ib_portid_t *path, char *prompt,
 		node->node.nodedesc);
 }
 
-static struct ibnd_node *
-find_existing_node(struct ibnd_fabric *fabric, struct ibnd_node *new)
+static struct ibnd_node_int *
+find_existing_node(struct ibnd_fabric_int *fabric, struct ibnd_node_int *new)
 {
 	int hash = HASHGUID(new->node.guid) % HTSZ;
-	struct ibnd_node *node;
+	struct ibnd_node_int *node;
 
 	for (node = fabric->nodestbl[hash]; node; node = node->htnext)
 		if (node->node.guid == new->node.guid)
@@ -233,9 +233,9 @@ find_existing_node(struct ibnd_fabric *fabric, struct ibnd_node *new)
 ibnd_node_t *
 ibnd_find_node_guid(ibnd_fabric_t *fabric, uint64_t guid)
 {
-	struct ibnd_fabric *f = CONV_FABRIC_INTERNAL(fabric);
+	struct ibnd_fabric_int *f = CONV_FABRIC_INTERNAL(fabric);
 	int hash = HASHGUID(guid) % HTSZ;
-	struct ibnd_node *node;
+	struct ibnd_node_int *node;
 
 	for (node = f->nodestbl[hash]; node; node = node->htnext)
 		if (node->node.guid == guid)
@@ -250,8 +250,8 @@ ibnd_update_node(ibnd_fabric_t *fabric, ibnd_node_t *node)
 	char portinfo_port0[IB_SMP_DATA_SIZE];
 	void *nd = node->nodedesc;
 	int p = 0;
-	struct ibnd_fabric *f = CONV_FABRIC_INTERNAL(fabric);
-	struct ibnd_node *n = CONV_NODE_INTERNAL(node);
+	struct ibnd_fabric_int *f = CONV_FABRIC_INTERNAL(fabric);
+	struct ibnd_node_int *n = CONV_NODE_INTERNAL(node);
 
 	if (query_node_info(f, n, &(n->node.path_portid)))
 		return (NULL);
@@ -288,7 +288,7 @@ done:
 ibnd_node_t *
 ibnd_find_node_dr(ibnd_fabric_t *fabric, char *dr_str)
 {
-	struct ibnd_fabric *f = CONV_FABRIC_INTERNAL(fabric);
+	struct ibnd_fabric_int *f = CONV_FABRIC_INTERNAL(fabric);
 	int i = 0;
 	ibnd_node_t *rc = f->fabric.from_node;
 	ib_dr_path_t path;
@@ -315,7 +315,7 @@ ibnd_find_node_dr(ibnd_fabric_t *fabric, char *dr_str)
 }
 
 static void
-add_to_nodeguid_hash(struct ibnd_node *node, struct ibnd_node *hash[])
+add_to_nodeguid_hash(struct ibnd_node_int *node, struct ibnd_node_int *hash[])
 {
 	int hash_idx = HASHGUID(node->node.guid) % HTSZ;
 
@@ -324,7 +324,7 @@ add_to_nodeguid_hash(struct ibnd_node *node, struct ibnd_node *hash[])
 }
 
 static void
-add_to_portguid_hash(struct ibnd_port *port, struct ibnd_port *hash[])
+add_to_portguid_hash(struct ibnd_port_int *port, struct ibnd_port_int *hash[])
 {
 	int hash_idx = HASHGUID(port->port.guid) % HTSZ;
 
@@ -333,7 +333,7 @@ add_to_portguid_hash(struct ibnd_port *port, struct ibnd_port *hash[])
 }
 
 static void
-add_to_type_list(struct ibnd_node*node, struct ibnd_fabric *fabric)
+add_to_type_list(struct ibnd_node_int *node, struct ibnd_fabric_int *fabric)
 {
 	switch (node->node.type) {
 		case IB_NODE_CA:
@@ -352,7 +352,7 @@ add_to_type_list(struct ibnd_node*node, struct ibnd_fabric *fabric)
 }
 
 static void
-add_to_nodedist(struct ibnd_node *node, struct ibnd_fabric *fabric)
+add_to_nodedist(struct ibnd_node_int *node, struct ibnd_fabric_int *fabric)
 {
 	int dist = node->node.dist;
 	if (node->node.type != IB_NODE_SWITCH)
@@ -363,10 +363,10 @@ add_to_nodedist(struct ibnd_node *node, struct ibnd_fabric *fabric)
 }
 
 
-static struct ibnd_node *
-create_node(struct ibnd_fabric *fabric, struct ibnd_node *temp, ib_portid_t *path, int dist)
+static struct ibnd_node_int *
+create_node(struct ibnd_fabric_int *fabric, struct ibnd_node_int *temp, ib_portid_t *path, int dist)
 {
-	struct ibnd_node *node;
+	struct ibnd_node_int *node;
 
 	node = malloc(sizeof(*node));
 	if (!node) {
@@ -390,8 +390,8 @@ create_node(struct ibnd_fabric *fabric, struct ibnd_node *temp, ib_portid_t *pat
 	return node;
 }
 
-static struct ibnd_port *
-find_existing_port_node(struct ibnd_node *node, struct ibnd_port *port)
+static struct ibnd_port_int *
+find_existing_port_node(struct ibnd_node_int *node, struct ibnd_port_int *port)
 {
 	if (port->port.portnum > node->node.numports || node->node.ports == NULL )
 		return (NULL);
@@ -399,10 +399,10 @@ find_existing_port_node(struct ibnd_node *node, struct ibnd_port *port)
 	return (CONV_PORT_INTERNAL(node->node.ports[port->port.portnum]));
 }
 
-static struct ibnd_port *
-add_port_to_node(struct ibnd_fabric *fabric, struct ibnd_node *node, struct ibnd_port *temp)
+static struct ibnd_port_int *
+add_port_to_node(struct ibnd_fabric_int *fabric, struct ibnd_node_int *node, struct ibnd_port_int *temp)
 {
-	struct ibnd_port *port;
+	struct ibnd_port_int *port;
 
 	port = malloc(sizeof(*port));
 	if (!port)
@@ -427,8 +427,8 @@ add_port_to_node(struct ibnd_fabric *fabric, struct ibnd_node *node, struct ibnd
 }
 
 static void
-link_ports(struct ibnd_node *node, struct ibnd_port *port,
-		struct ibnd_node *remotenode, struct ibnd_port *remoteport)
+link_ports(struct ibnd_node_int *node, struct ibnd_port_int *port,
+		struct ibnd_node_int *remotenode, struct ibnd_port_int *remoteport)
 {
 	IBND_DEBUG("linking: 0x%" PRIx64 " %p->%p:%u and 0x%" PRIx64 " %p->%p:%u\n",
 		node->node.guid, node, port, port->port.portnum,
@@ -443,13 +443,13 @@ link_ports(struct ibnd_node *node, struct ibnd_port *port,
 }
 
 static int
-get_remote_node(struct ibnd_fabric *fabric, struct ibnd_node *node, struct ibnd_port *port, ib_portid_t *path,
-		int portnum, int dist)
+get_remote_node(struct ibnd_fabric_int *fabric, struct ibnd_node_int *node, struct ibnd_port_int *port,
+		ib_portid_t *path, int portnum, int dist)
 {
-	struct ibnd_node node_buf;
-	struct ibnd_port port_buf;
-	struct ibnd_node *remotenode, *oldnode;
-	struct ibnd_port *remoteport, *oldport;
+	struct ibnd_node_int node_buf;
+	struct ibnd_port_int port_buf;
+	struct ibnd_node_int *remotenode, *oldnode;
+	struct ibnd_port_int *remoteport, *oldport;
 
 	memset(&node_buf, 0, sizeof(node_buf));
 	memset(&port_buf, 0, sizeof(port_buf));
@@ -495,12 +495,12 @@ ibnd_fabric_t *
 ibnd_discover_fabric(struct ibmad_port *ibmad_port, int timeout_ms,
 			ib_portid_t *from, int hops)
 {
-	struct ibnd_fabric *fabric = NULL;
+	struct ibnd_fabric_int *fabric = NULL;
 	ib_portid_t my_portid = {0};
-	struct ibnd_node node_buf;
-	struct ibnd_port port_buf;
-	struct ibnd_node *node;
-	struct ibnd_port *port;
+	struct ibnd_node_int node_buf;
+	struct ibnd_port_int port_buf;
+	struct ibnd_node_int *node;
+	struct ibnd_port_int *port;
 	int i;
 	int dist = 0;
 	ib_portid_t *path;
@@ -611,7 +611,7 @@ error:
 }
 
 static void
-destroy_node(struct ibnd_node *node)
+destroy_node(struct ibnd_node_int *node)
 {
 	int p = 0;
 
@@ -625,10 +625,10 @@ destroy_node(struct ibnd_node *node)
 void
 ibnd_destroy_fabric(ibnd_fabric_t *fabric)
 {
-	struct ibnd_fabric *f = CONV_FABRIC_INTERNAL(fabric);
+	struct ibnd_fabric_int *f = CONV_FABRIC_INTERNAL(fabric);
 	int dist = 0;
-	struct ibnd_node *node = NULL;
-	struct ibnd_node *next = NULL;
+	struct ibnd_node_int *node = NULL;
+	struct ibnd_node_int *next = NULL;
 	ibnd_chassis_t *ch, *ch_next;
 
 	ch = f->first_chassis;
@@ -687,9 +687,9 @@ ibnd_iter_nodes_type(ibnd_fabric_t *fabric,
 		int node_type,
 		void *user_data)
 {
-	struct ibnd_fabric *f = CONV_FABRIC_INTERNAL(fabric);
-	struct ibnd_node *list = NULL;
-	struct ibnd_node *cur = NULL;
+	struct ibnd_fabric_int *f = CONV_FABRIC_INTERNAL(fabric);
+	struct ibnd_node_int *list = NULL;
+	struct ibnd_node_int *cur = NULL;
 
 	switch (node_type) {
 		case IB_NODE_SWITCH:
diff --git a/infiniband-diags/libibnetdisc/src/internal.h b/infiniband-diags/libibnetdisc/src/internal.h
index 5785e33..bdef871 100644
--- a/infiniband-diags/libibnetdisc/src/internal.h
+++ b/infiniband-diags/libibnetdisc/src/internal.h
@@ -49,47 +49,47 @@
 #define	IBND_ERROR(fmt, ...) \
 		fprintf(stderr, "%s:%u; " fmt, __FILE__, __LINE__, ## __VA_ARGS__)
 
-struct ibnd_node {
+struct ibnd_node_int {
 	/* This member MUST BE FIRST */
 	ibnd_node_t node;
 
 	/* internal use only */
 	unsigned char ch_found;
-	struct ibnd_node *htnext; /* hash table list */
-	struct ibnd_node *dnext; /* nodesdist next */
-	struct ibnd_node *type_next; /* next based on type */
+	struct ibnd_node_int *htnext; /* hash table list */
+	struct ibnd_node_int *dnext; /* nodesdist next */
+	struct ibnd_node_int *type_next; /* next based on type */
 };
-#define CONV_NODE_INTERNAL(node) ((struct ibnd_node *)node)
+#define CONV_NODE_INTERNAL(node) ((struct ibnd_node_int *)node)
 
-struct ibnd_port {
+struct ibnd_port_int {
 	/* This member MUST BE FIRST */
 	ibnd_port_t port;
 
 	/* internal use only */
-	struct ibnd_port *htnext;
+	struct ibnd_port_int *htnext;
 };
-#define CONV_PORT_INTERNAL(port) ((struct ibnd_port *)port)
+#define CONV_PORT_INTERNAL(port) ((struct ibnd_port_int *)port)
 
 /* HASH table defines */
 #define HASHGUID(guid) ((uint32_t)(((uint32_t)(guid) * 101) ^ ((uint32_t)((guid) >> 32) * 103)))
 #define HTSZ 137
 
-struct ibnd_fabric {
+struct ibnd_fabric_int {
 	/* This member MUST BE FIRST */
 	ibnd_fabric_t fabric;
 
 	/* internal use only */
-	struct ibnd_node *nodestbl[HTSZ];
-	struct ibnd_port *portstbl[HTSZ];
-	struct ibnd_node *nodesdist[MAXHOPS+1];
+	struct ibnd_node_int *nodestbl[HTSZ];
+	struct ibnd_port_int *portstbl[HTSZ];
+	struct ibnd_node_int *nodesdist[MAXHOPS+1];
 	ibnd_chassis_t *first_chassis;
 	ibnd_chassis_t *current_chassis;
 	ibnd_chassis_t *last_chassis;
-	struct ibnd_node *switches;
-	struct ibnd_node *ch_adapters;
-	struct ibnd_node *routers;
+	struct ibnd_node_int *switches;
+	struct ibnd_node_int *ch_adapters;
+	struct ibnd_node_int *routers;
 	ib_portid_t selfportid;
 };
-#define CONV_FABRIC_INTERNAL(fabric) ((struct ibnd_fabric *)fabric)
+#define CONV_FABRIC_INTERNAL(fabric) ((struct ibnd_fabric_int *)fabric)
 
 #endif /* _INTERNAL_H_ */
-- 
1.5.4.5



More information about the general mailing list