[ofa-general] [PATCH] opensm: remove reassign_lfts configuration parameter

[Sasha Khapyorsky]

This removes actually useless subn.opt.reassign_lfts parameter.
Its value is used only for initial setup of ignore_existing_lfts flag.
But later this flag becomes unconditionally TRUE if at least one switch
is found in the fabric. If not (and fabric is just back to back
connected CAs) there is no routing and this flag is not used. In any
case initial value does not matter.

Signed-off-by: Sasha Khapyorsky <sashak at voltaire.com>
---
 opensm/include/opensm/osm_subnet.h |   10 +---------
 opensm/opensm/osm_subnet.c         |   14 +-------------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/opensm/include/opensm/osm_subnet.h b/opensm/include/opensm/osm_subnet.h
index 92f2bc0..84ed6d4 100644
--- a/opensm/include/opensm/osm_subnet.h
+++ b/opensm/include/opensm/osm_subnet.h
@@ -239,7 +239,6 @@ typedef struct _osm_subn_opt
   uint8_t		   max_op_vls;
   uint8_t		   force_link_speed;
   boolean_t		   reassign_lids;
-  boolean_t		   reassign_lfts;
   boolean_t		   ignore_other_sm;
   boolean_t		   single_thread;
   boolean_t		   no_multicast_option;
@@ -345,12 +344,6 @@ typedef struct _osm_subn_opt
 *		Otherwise (the default),
 *		OpenSM always tries to preserve as LIDs as much as possible.
 *
-*	reassign_lfts
-*		If TRUE ignore existing LFT entries on first sweep (default).
-*		Otherwise only non minimal hop cases are modified.
-*		NOTE: A standby SM clears its first sweep flag - since the
-*		master SM already sweeps...
-*
 *	ignore_other_sm_option
 *		This flag is TRUE if other SMs on the subnet should be ignored.
 *
@@ -656,9 +649,8 @@ typedef struct _osm_subn
 *     This flag is a dynamic flag to instruct the LFT assignment to
 *     ignore existing legal LFT settings.
 *     The value will be set according to :
-*     - During SM init set to the reassign_lfts flag value
-*     - Coming out of STANDBY it will be cleared (other SM worked)
 *     - Any change to the list of switches will set it to high
+*     - Coming out of STANDBY it will be cleared (other SM worked)
 *     - Set to FALSE upon end of all lft assignments.
 *
 *  subnet_initalization_error
diff --git a/opensm/opensm/osm_subnet.c b/opensm/opensm/osm_subnet.c
index 7e17945..7e7a4d5 100644
--- a/opensm/opensm/osm_subnet.c
+++ b/opensm/opensm/osm_subnet.c
@@ -221,8 +221,7 @@ osm_subn_init(
   /* note that insert and remove are part of the port_profile thing */
   cl_map_init(&(p_subn->opt.port_prof_ignore_guids), 10);
 
-  /* ignore_existing_lfts follows reassign_lfts on first sweep */
-  p_subn->ignore_existing_lfts = p_subn->opt.reassign_lfts;
+  p_subn->ignore_existing_lfts = TRUE;
 
   /* we assume master by default - so we only need to set it true if STANDBY */
   p_subn->coming_out_of_standby = FALSE;
@@ -451,7 +450,6 @@ osm_subn_set_default_opt(
   p_opt->max_op_vls = OSM_DEFAULT_MAX_OP_VLS;
   p_opt->force_link_speed = 15;
   p_opt->reassign_lids = FALSE;
-  p_opt->reassign_lfts = TRUE;
   p_opt->ignore_other_sm = FALSE;
   p_opt->single_thread = FALSE;
   p_opt->no_multicast_option = FALSE;
@@ -1221,10 +1219,6 @@ osm_subn_parse_conf_file(
         p_key, p_val, &p_opts->reassign_lids);
 
       __osm_subn_opts_unpack_boolean(
-        "reassign_lfts",
-        p_key, p_val, &p_opts->reassign_lfts);
-
-      __osm_subn_opts_unpack_boolean(
         "ignore_other_sm",
         p_key, p_val, &p_opts->ignore_other_sm);
 
@@ -1544,11 +1538,6 @@ osm_subn_write_conf_file(
     "sweep_interval %u\n\n"
     "# If TRUE cause all lids to be reassigned\n"
     "reassign_lids %s\n\n"
-    "# If TRUE ignore existing LFT entries on first sweep (default).\n"
-    "# Otherwise only non minimal hop cases are modified.\n"
-    "# NOTE: A standby SM clears its first sweep flag - since the\n"
-    "# master SM already sweeps...\n"
-    "reassign_lfts %s\n\n"
     "# If TRUE forces every sweep to be a heavy sweep\n"
     "force_heavy_sweep %s\n\n"
     "# If TRUE every trap will cause a heavy sweep.\n"
@@ -1556,7 +1545,6 @@ osm_subn_write_conf_file(
     "sweep_on_trap %s\n\n",
     p_opts->sweep_interval,
     p_opts->reassign_lids ? "TRUE" : "FALSE",
-    p_opts->reassign_lfts ? "TRUE" : "FALSE",
     p_opts->force_heavy_sweep ? "TRUE" : "FALSE",
     p_opts->sweep_on_trap ? "TRUE" : "FALSE"
     );
-- 
1.5.3.rc2.38.g11308