diff mbox

[27/27] Call drop manager before checking for other Master SM in the fabric

Message ID 1343750695-28063-27-git-send-email-alexne@mellanox.com (mailing list archive)
State Accepted
Delegated to: Alex Netes
Headers show

Commit Message

Alex Netes July 31, 2012, 4:04 p.m. UTC
We need to clean the database from dropped nodes/ports even in the cases
where we find other Master SM and might leave the do_sweep function.

Signed-off-by: Vladimir Koushnir <vladimirk@mellanox.com>
Signed-off-by: Alex Netes <alexne@mellanox.com>
Signed-off-by: Hal Rosenstock <hal@mellanox.com>
---
 opensm/osm_state_mgr.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
diff mbox

Patch

diff --git a/opensm/osm_state_mgr.c b/opensm/osm_state_mgr.c
index 183be36..191d87f 100644
--- a/opensm/osm_state_mgr.c
+++ b/opensm/osm_state_mgr.c
@@ -1272,6 +1272,8 @@  repeat_discovery:
 
 	OSM_LOG_MSG_BOX(sm->p_log, OSM_LOG_VERBOSE, "HEAVY SWEEP COMPLETE");
 
+	osm_drop_mgr_process(sm);
+
 	/* If we are MASTER - get the highest remote_sm, and
 	 * see if it is higher than our local sm.
 	 */
@@ -1304,9 +1306,6 @@  repeat_discovery:
 		}
 	}
 
-	/* Need to continue with lid assignment */
-	osm_drop_mgr_process(sm);
-
 	/*
 	 * If we are not MASTER already - this means that we are
 	 * in discovery state. call osm_sm_state_mgr with signal