[ofa-general] [PATCH] opensm: merge disable_multicast and no_multicast_option options

[Sasha Khapyorsky]

I cannot find how those options should be different.

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

diff --git a/opensm/include/opensm/osm_subnet.h b/opensm/include/opensm/osm_subnet.h
index b1dd659..daab453 100644
--- a/opensm/include/opensm/osm_subnet.h
+++ b/opensm/include/opensm/osm_subnet.h
@@ -221,7 +221,6 @@ typedef struct _osm_subn_opt {
 	boolean_t reassign_lids;
 	boolean_t ignore_other_sm;
 	boolean_t single_thread;
-	boolean_t no_multicast_option;
 	boolean_t disable_multicast;
 	boolean_t force_log_flush;
 	uint8_t subnet_timeout;
@@ -338,7 +337,7 @@ typedef struct _osm_subn_opt {
 *	ignore_other_sm_option
 *		This flag is TRUE if other SMs on the subnet should be ignored.
 *
-*	no_multicast_option
+*	disable_multicast
 *		This flag is TRUE if OpenSM should disable multicast support.
 *
 *	max_msg_fifo_timeout
diff --git a/opensm/opensm/osm_sa_class_port_info.c b/opensm/opensm/osm_sa_class_port_info.c
index f0afb32..0839c1b 100644
--- a/opensm/opensm/osm_sa_class_port_info.c
+++ b/opensm/opensm/osm_sa_class_port_info.c
@@ -167,7 +167,7 @@ __osm_cpi_rcv_respond(IN osm_sa_t * sa,
 	if (sa->p_subn->opt.qos)
 		ib_class_set_cap_mask2(p_resp_cpi, OSM_CAP2_IS_QOS_SUPPORTED);
 
-	if (sa->p_subn->opt.no_multicast_option != TRUE)
+	if (!sa->p_subn->opt.disable_multicast)
 		p_resp_cpi->cap_mask |= OSM_CAP_IS_UD_MCAST_SUP;
 	p_resp_cpi->cap_mask = cl_hton16(p_resp_cpi->cap_mask);
 
diff --git a/opensm/opensm/osm_subnet.c b/opensm/opensm/osm_subnet.c
index 47d735f..a916270 100644
--- a/opensm/opensm/osm_subnet.c
+++ b/opensm/opensm/osm_subnet.c
@@ -409,7 +409,6 @@ void osm_subn_set_default_opt(IN osm_subn_opt_t * const p_opt)
 	p_opt->reassign_lids = FALSE;
 	p_opt->ignore_other_sm = FALSE;
 	p_opt->single_thread = FALSE;
-	p_opt->no_multicast_option = FALSE;
 	p_opt->disable_multicast = FALSE;
 	p_opt->force_log_flush = FALSE;
 	p_opt->subnet_timeout = OSM_DEFAULT_SUBNET_TIMEOUT;
@@ -1230,9 +1229,6 @@ ib_api_status_t osm_subn_parse_conf_file(IN osm_subn_opt_t * const p_opts)
 		opts_unpack_boolean("single_thread",
 				    p_key, p_val, &p_opts->single_thread);
 
-		opts_unpack_boolean("no_multicast_option",
-				    p_key, p_val, &p_opts->no_multicast_option);
-
 		opts_unpack_boolean("disable_multicast",
 				    p_key, p_val, &p_opts->disable_multicast);
 
@@ -1673,9 +1669,8 @@ ib_api_status_t osm_subn_write_conf_file(IN osm_subn_opt_t * const p_opts)
 		"enable_quirks %s\n\n"
 		"# If TRUE disables client reregistration\n"
 		"no_clients_rereg %s\n\n"
-		"# If TRUE OpenSM should disable multicast support\n"
-		"no_multicast_option %s\n\n"
-		"# No multicast routing is performed if TRUE\n"
+		"# If TRUE OpenSM should disable multicast support and\n"
+		"# no multicast routing is performed if TRUE\n"
 		"disable_multicast %s\n\n"
 		"# If TRUE opensm will exit on fatal initialization issues\n"
 		"exit_on_fatal %s\n\n" "# console [off|local"
@@ -1695,7 +1690,6 @@ ib_api_status_t osm_subn_write_conf_file(IN osm_subn_opt_t * const p_opts)
 		p_opts->dump_files_dir,
 		p_opts->enable_quirks ? "TRUE" : "FALSE",
 		p_opts->no_clients_rereg ? "TRUE" : "FALSE",
-		p_opts->no_multicast_option ? "TRUE" : "FALSE",
 		p_opts->disable_multicast ? "TRUE" : "FALSE",
 		p_opts->exit_on_fatal ? "TRUE" : "FALSE",
 		p_opts->console,
-- 
1.5.4.rc2.60.gb2e62