This reverts the patch where 'coming_out_of_standby' flag was replaced by 'first_time_master_sweep'. It is probably a good idea in general to merge those, but right now it will change the default lid manager behavior, since it will ignore guid2lid file in initial sweep.
Signed-off-by: Sasha Khapyorsky <[email protected]> --- opensm/opensm/osm_lid_mgr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/opensm/opensm/osm_lid_mgr.c b/opensm/opensm/osm_lid_mgr.c index 7da4eb0..97b1de6 100644 --- a/opensm/opensm/osm_lid_mgr.c +++ b/opensm/opensm/osm_lid_mgr.c @@ -304,7 +304,7 @@ static int lid_mgr_init_sweep(IN osm_lid_mgr_t * p_mgr) 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->first_time_master_sweep == TRUE) { + 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) -- 1.7.0.4 -- 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
