diff mbox

opensm: Revert "opensm/osm_ucast_ftree: When roots are not connected, update hop count but not lft"

Message ID 1359984011-30753-7-git-send-email-alexne@mellanox.com (mailing list archive)
State Accepted
Delegated to: Hal Rosenstock
Headers show

Commit Message

Alex Netes Feb. 4, 2013, 1:20 p.m. UTC 
This reverts commit 81dade3aeb1d5c80472a4f9fef55e9916bb38d3a.

The patch causes crashes in fat-tree routing and it's replaced by the
following patch.

Signed-off-by: Vincent Ficet <jean-vincent.ficet@bull.net>
Signed-off-by: Alex Netes <alexne@mellanox.com>
---
 opensm/osm_ucast_ftree.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
diff mbox

Patch

diff --git a/opensm/osm_ucast_ftree.c b/opensm/osm_ucast_ftree.c
index 8363bd2..c81e7a3 100644
--- a/opensm/osm_ucast_ftree.c
+++ b/opensm/osm_ucast_ftree.c
@@ -3038,10 +3038,8 @@  static void fabric_route_roots(IN ftree_fabric_t * p_ftree)
 				"through port %u\n",
 				tuple_to_str(p_sw->tuple), lid, port_num);
 
-			if (p_ftree->p_osm->subn.opt.connect_roots) {
-				/* set local lft */
-				p_sw->p_osm_sw->new_lft[lid] = port_num;
-			}
+			/* set local lft */
+			p_sw->p_osm_sw->new_lft[lid] = port_num;
 
 			/*
 			 * Set local min hop table.
@@ -4221,10 +4219,12 @@  static int do_routing(IN void *context)
 		"Filling switch forwarding tables for switch-to-switch paths\n");
 	fabric_route_to_switches(p_ftree);
 
-	OSM_LOG(&p_ftree->p_osm->log, OSM_LOG_VERBOSE,
-		"Connecting switches that are unreachable within "
-		"Up/Down rules\n");
-	fabric_route_roots(p_ftree);
+	if (p_ftree->p_osm->subn.opt.connect_roots) {
+		OSM_LOG(&p_ftree->p_osm->log, OSM_LOG_VERBOSE,
+			"Connecting switches that are unreachable within "
+			"Up/Down rules\n");
+		fabric_route_roots(p_ftree);
+	}
 
 	/* for each switch, set its fwd table */
 	cl_qmap_apply_func(&p_ftree->sw_tbl, set_sw_fwd_table, (void *)p_ftree);