[ofa-general] [PATCH] Fix spelling of "consolidate"

[Ira Weiny]

>From 8415e746a545526fa88f30d4b77534279fe4aec6 Mon Sep 17 00:00:00 2001
From: Ira K. Weiny <weiny2 at llnl.gov>
Date: Tue, 15 Jan 2008 15:17:26 -0800
Subject: [PATCH] Fix spelling of "consolidate"


Signed-off-by: Ira K. Weiny <weiny2 at llnl.gov>
---
 opensm/include/opensm/osm_subnet.h     |    2 +-
 opensm/man/opensm.8                    |    4 ++--
 opensm/opensm/main.c                   |    6 ++++--
 opensm/opensm/osm_sa_mcmember_record.c |    2 +-
 opensm/opensm/osm_subnet.c             |   10 +++++-----
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/opensm/include/opensm/osm_subnet.h b/opensm/include/opensm/osm_subnet.h
index 558b34e..e60cf91 100644
--- a/opensm/include/opensm/osm_subnet.h
+++ b/opensm/include/opensm/osm_subnet.h
@@ -283,7 +283,7 @@ typedef struct _osm_subn_opt {
 	char *event_plugin_name;
 	char *node_name_map_name;
 	char *prefix_routes_file;
-	boolean_t consolodate_ipv6_snm_req;
+	boolean_t consolidate_ipv6_snm_req;
 } osm_subn_opt_t;
 /*
 * FIELDS
diff --git a/opensm/man/opensm.8 b/opensm/man/opensm.8
index 9c7b371..ab7fb8e 100644
--- a/opensm/man/opensm.8
+++ b/opensm/man/opensm.8
@@ -239,8 +239,8 @@ Specify the sweep time for the performance manager in seconds
 (default is 180 seconds).  Only takes
 effect if --enable-perfmgr was specified at configure time.
 .TP
-.BI --consolodate_ipv6_snm_reqests
-Consolodate IPv6 Solicited Node Multicast group joins into 1 IB multicast
+.BI --consolidate_ipv6_snm_reqests
+Consolidate IPv6 Solicited Node Multicast group joins into 1 IB multicast
 group.
 .TP
 \fB\-v\fR, \fB\-\-verbose\fR
diff --git a/opensm/opensm/main.c b/opensm/opensm/main.c
index a84f6c2..de69f68 100644
--- a/opensm/opensm/main.c
+++ b/opensm/opensm/main.c
@@ -296,6 +296,8 @@ static void show_usage(void)
 	       "          Prefix routes control how the SA responds to path record\n"
 	       "          queries for off-subnet DGIDs.  Default file is:\n"
 	       "              "OSM_DEFAULT_PREFIX_ROUTES_FILE"\n\n");
+	printf("--consolidate_ipv6_snm_req\n"
+		"Consolidate IPv6 Solicited Node Multicast group joins into 1 IB multicast group.\n");
 	printf("-v\n"
 	       "--verbose\n"
 	       "          This option increases the log verbosity level.\n"
@@ -615,7 +617,7 @@ int main(int argc, char *argv[])
 		{"perfmgr_sweep_time_s", 1, NULL, 2},
 #endif
 		{"prefix_routes_file", 1, NULL, 3},
-		{"consolodate_ipv6_snm_reqests", 0, NULL, 4},
+		{"consolidate_ipv6_snm_reqests", 0, NULL, 4},
 		{NULL, 0, NULL, 0}	/* Required at the end of the array */
 	};
 
@@ -918,7 +920,7 @@ int main(int argc, char *argv[])
 			opt.prefix_routes_file = optarg;
 			break;
 		case 4:
-			opt.consolodate_ipv6_snm_req = TRUE;
+			opt.consolidate_ipv6_snm_req = TRUE;
 			break;
 		case 'h':
 		case '?':
diff --git a/opensm/opensm/osm_sa_mcmember_record.c b/opensm/opensm/osm_sa_mcmember_record.c
index 12c5483..d057207 100644
--- a/opensm/opensm/osm_sa_mcmember_record.c
+++ b/opensm/opensm/osm_sa_mcmember_record.c
@@ -1169,7 +1169,7 @@ __search_mgrp_by_mgid(IN cl_map_item_t * const p_map_item, IN void *context)
 	   the same MGID */
 	if (memcmp(&p_mgrp->mcmember_rec.mgid, p_recvd_mgid, sizeof(ib_gid_t))) {
 
-		if (sa->p_subn->opt.consolodate_ipv6_snm_req) {
+		if (sa->p_subn->opt.consolidate_ipv6_snm_req) {
 			/* Special Case IPV6 Multicast Loopback addresses */
 			/* 0xff12601bXXXX0000 : 0x00000001ffYYYYYY */
 			/* Where XXXX is the partition and YYYYYY is the last 24 bits
diff --git a/opensm/opensm/osm_subnet.c b/opensm/opensm/osm_subnet.c
index 558ea68..c9b4d57 100644
--- a/opensm/opensm/osm_subnet.c
+++ b/opensm/opensm/osm_subnet.c
@@ -481,7 +481,7 @@ void osm_subn_set_default_opt(IN osm_subn_opt_t * const p_opt)
 	p_opt->enable_quirks = FALSE;
 	p_opt->no_clients_rereg = FALSE;
 	p_opt->prefix_routes_file = OSM_DEFAULT_PREFIX_ROUTES_FILE;
-	p_opt->consolodate_ipv6_snm_req = FALSE;
+	p_opt->consolidate_ipv6_snm_req = FALSE;
 	subn_set_default_qos_options(&p_opt->qos_options);
 	subn_set_default_qos_options(&p_opt->qos_ca_options);
 	subn_set_default_qos_options(&p_opt->qos_sw0_options);
@@ -1396,8 +1396,8 @@ ib_api_status_t osm_subn_parse_conf_file(IN osm_subn_opt_t * const p_opts)
 		opts_unpack_charp("prefix_routes_file",
 				  p_key, p_val, &p_opts->prefix_routes_file);
 
-		opts_unpack_boolean("consolodate_ipv6_snm_req",
-				p_key, p_val, &p_opts->consolodate_ipv6_snm_req);
+		opts_unpack_boolean("consolidate_ipv6_snm_req",
+				p_key, p_val, &p_opts->consolidate_ipv6_snm_req);
 	}
 	fclose(opts_file);
 
@@ -1727,8 +1727,8 @@ ib_api_status_t osm_subn_write_conf_file(IN osm_subn_opt_t * const p_opts)
 
 	fprintf(opts_file,
 		"#\n# IPv6 MCast Options\n#\n"
-		"consolodate_ipv6_snm_req %s\n\n",
-		p_opts->consolodate_ipv6_snm_req ? "TRUE" : "FALSE");
+		"consolidate_ipv6_snm_req %s\n\n",
+		p_opts->consolidate_ipv6_snm_req ? "TRUE" : "FALSE");
 
 	/* optional string attributes ... */
 
-- 
1.5.1

-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Fix-spelling-of-consolidate.patch
Type: application/octet-stream
Size: 4919 bytes
Desc: not available
URL: <http://lists.openfabrics.org/pipermail/general/attachments/20080115/6ed9e3f9/attachment.obj>