Skip to contentSkip to conversation

infiniband-diags: Do not exit when unexpected node found

PATCH Applied Eli Dorfman (Voltaire) 2 participants 2 messages Sep 5, 2010 – Sep 6, 2010 1 message not in the archive InfiniBand

lore
Share & tools
lore

Eli Dorfman (Voltaire)

author
#0 lore raw

PATCH 1/1 infiniband-diags: Do not exit when unexpected node found

Show error message but do not exit when unexpected node is found.

Signed-off-by Eli Dorfman <elid-smomgflXvOZWk0Htik3J/[email protected]>
---
 infiniband-diags/libibnetdisc/src/chassis.c |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)
infiniband-diags/libibnetdisc/src/chassis.c +2 -7
index 25d7473..7762d22 100644
@@ -457,7 +457,6 @@ static int get_sfb_slot(ibnd_node_t * n, ibnd_port_t * lineport)
 	} else {
 		IBND_ERROR("Unexpected node found: guid 0x%016" PRIx64 "\n",
 			   n->guid);
-		return -1;
 	}
 	return 0;
 }

@@ -498,7 +497,6 @@ static int get_router_slot(ibnd_node_t * n, ibnd_port_t * spineport)
 	} else {
 		IBND_ERROR("Unexpected node found: guid 0x%016" PRIx64 "\n",
 			   spineport->node->guid);
-		return -1;
 	}
 	return 0;
 }

@@ -533,7 +531,6 @@ static int get_slb_slot(ibnd_node_t * n, ibnd_port_t * spineport)
 	} else {
 		IBND_ERROR("Unexpected node found: guid 0x%016" PRIx64 "\n",
 			   spineport->node->guid);
-		return -1;
 	}
 	return 0;
 }

@@ -588,8 +585,7 @@ static int fill_voltaire_chassis_record(ibnd_node_t * node)
 			}
 			if (!node->ch_type)
 				/* we assume here that remoteport belongs to line */
-				if (get_sfb_slot(node, port->remoteport))
-					return -1;
+				get_sfb_slot(node, port->remoteport);
 
 			/* we could break here, but need to find if more routers connected */
 		}

@@ -607,8 +603,7 @@ static int fill_voltaire_chassis_record(ibnd_node_t * node)
 				continue;
 
 			/* we assume here that remoteport belongs to spine */
-			if (get_slb_slot(node, port->remoteport))
-				return -1;
+			get_slb_slot(node, port->remoteport);
 			break;
 		}
 	}
Signature · 6 lines
1.5.5

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): [email protected]