diff mbox

[opensm] osm_lid_mgr.c: fix duplicate LID assignment after SM port down

Message ID 5166C677.8080900@dev.mellanox.co.il (mailing list archive)
State Accepted
Delegated to: Hal Rosenstock
Headers show

Commit Message

Hal Rosenstock April 11, 2013, 2:19 p.m. UTC 
From: Alex Netes <alexne@mellanox.com>

We must discard previous guid2lid db if this is the first master sweep and
reassign_lids option is TRUE.
If we came out of standby and honor_guid2lid_file option is TRUE, we must
restore guid2lid db. Otherwise if honor_guid2lid_file option is FALSE we must
discard previous guid2lid db.

Signed-off-by: Alex Netes <alexne@mellanox.com>
Signed-off-by: Hal Rosenstock <hal@mellanox.com>
---
 opensm/osm_lid_mgr.c |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)
diff mbox

Patch

diff --git a/opensm/osm_lid_mgr.c b/opensm/osm_lid_mgr.c
index f92084a..4289424 100644
--- a/opensm/osm_lid_mgr.c
+++ b/opensm/osm_lid_mgr.c
@@ -302,11 +302,17 @@  static int lid_mgr_init_sweep(IN osm_lid_mgr_t * p_mgr)
 
 	lmc_mask = ~((1 << p_mgr->p_subn->opt.lmc) - 1);
 
-	/* if we came out of standby we need to discard any previous guid2lid
-	   info we might have.
-	   Do this only if the honor_guid2lid_file option is FALSE. If not, then
-	   need to honor this file. */
-	if (p_mgr->p_subn->coming_out_of_standby == TRUE) {
+	/* We must discard previous guid2lid db if this is the first master
+	 * sweep and reassign_lids option is TRUE.
+	 * If we came out of standby and honor_guid2lid_file option is TRUE, we
+	 * must restore guid2lid db. Otherwise if honor_guid2lid_file option is
+	 * FALSE we must discard previous guid2lid db.
+	 */
+	if (p_mgr->p_subn->first_time_master_sweep == TRUE &&
+	    p_mgr->p_subn->opt.reassign_lids == TRUE) {
+		osm_db_clear(p_mgr->p_g2l);
+		memset(p_mgr->used_lids, 0, sizeof(p_mgr->used_lids));
+	} else if (p_mgr->p_subn->coming_out_of_standby == TRUE) {
 		osm_db_clear(p_mgr->p_g2l);
 		memset(p_mgr->used_lids, 0, sizeof(p_mgr->used_lids));
 		if (p_mgr->p_subn->opt.honor_guid2lid_file == FALSE)