[ofa-general] [PATCH] opensm: rename sm signal

[Sasha Khapyorsky]

Rename sm signal OSM_SM_SIGNAL_MASTER_OR_HIGHER_SM_DETECTED_DONE to
shorter OSM_SM_SIGNAL_MASTER_OR_HIGHER_SM_DETECTED to be consistent with
other sm signal names.

Signed-off-by: Sasha Khapyorsky <sashak at voltaire.com>
---
 opensm/include/opensm/osm_base.h |    2 +-
 opensm/opensm/osm_helper.c       |    2 +-
 opensm/opensm/osm_sm_state_mgr.c |    4 ++--
 opensm/opensm/osm_state_mgr.c    |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/opensm/include/opensm/osm_base.h b/opensm/include/opensm/osm_base.h
index 8e52ee8..54df41e 100644
--- a/opensm/include/opensm/osm_base.h
+++ b/opensm/include/opensm/osm_base.h
@@ -822,7 +822,7 @@ typedef enum _osm_sm_signal {
 	OSM_SM_SIGNAL_HANDOVER_SENT,
 	OSM_SM_SIGNAL_ACKNOWLEDGE,
 	OSM_SM_SIGNAL_STANDBY,
-	OSM_SM_SIGNAL_MASTER_OR_HIGHER_SM_DETECTED_DONE,
+	OSM_SM_SIGNAL_MASTER_OR_HIGHER_SM_DETECTED,
 	OSM_SM_SIGNAL_WAIT_FOR_HANDOVER,
 	OSM_SM_SIGNAL_MAX
 } osm_sm_signal_t;
diff --git a/opensm/opensm/osm_helper.c b/opensm/opensm/osm_helper.c
index 2ed0011..0443987 100644
--- a/opensm/opensm/osm_helper.c
+++ b/opensm/opensm/osm_helper.c
@@ -2303,7 +2303,7 @@ static const char *const __osm_sm_mgr_signal_str[] = {
 	"OSM_SM_SIGNAL_HANDOVER_SENT",	/* 7 */
 	"OSM_SM_SIGNAL_ACKNOWLEDGE",	/* 8 */
 	"OSM_SM_SIGNAL_STANDBY",	/* 9 */
-	"OSM_SM_SIGNAL_MASTER_OR_HIGHER_SM_DETECTED_DONE",	/* 10 */
+	"OSM_SM_SIGNAL_MASTER_OR_HIGHER_SM_DETECTED",	/* 10 */
 	"OSM_SM_SIGNAL_WAIT_FOR_HANDOVER",	/* 11 */
 	"UNKNOWN STATE!!"	/* 12 */
 };
diff --git a/opensm/opensm/osm_sm_state_mgr.c b/opensm/opensm/osm_sm_state_mgr.c
index 9f66cb4..343a9e3 100644
--- a/opensm/opensm/osm_sm_state_mgr.c
+++ b/opensm/opensm/osm_sm_state_mgr.c
@@ -280,7 +280,7 @@ ib_api_status_t osm_sm_state_mgr_process(osm_sm_t * sm,
 			sm->p_subn->master_sm_base_lid =
 			    sm->p_subn->sm_base_lid;
 			break;
-		case OSM_SM_SIGNAL_MASTER_OR_HIGHER_SM_DETECTED_DONE:
+		case OSM_SM_SIGNAL_MASTER_OR_HIGHER_SM_DETECTED:
 			/*
 			 * Finished all discovery actions - move to STANDBY
 			 * start the polling
@@ -484,7 +484,7 @@ ib_api_status_t osm_sm_state_mgr_check_legality(osm_sm_t * sm,
 	case IB_SMINFO_STATE_DISCOVERING:
 		switch (signal) {
 		case OSM_SM_SIGNAL_DISCOVERY_COMPLETED:
-		case OSM_SM_SIGNAL_MASTER_OR_HIGHER_SM_DETECTED_DONE:
+		case OSM_SM_SIGNAL_MASTER_OR_HIGHER_SM_DETECTED:
 		case OSM_SM_SIGNAL_HANDOVER:
 			status = IB_SUCCESS;
 			break;
diff --git a/opensm/opensm/osm_state_mgr.c b/opensm/opensm/osm_state_mgr.c
index e548e5b..ba3b6bf 100644
--- a/opensm/opensm/osm_state_mgr.c
+++ b/opensm/opensm/osm_state_mgr.c
@@ -1137,7 +1137,7 @@ _repeat_discovery:
 		 * MASTER_OR_HIGHER_SM_DETECTED_DONE
 		 */
 		osm_sm_state_mgr_process(sm,
-					 OSM_SM_SIGNAL_MASTER_OR_HIGHER_SM_DETECTED_DONE);
+					 OSM_SM_SIGNAL_MASTER_OR_HIGHER_SM_DETECTED);
 		OSM_LOG_MSG_BOX(sm->p_log, OSM_LOG_VERBOSE,
 				"ENTERING STANDBY STATE");
 		/* notify master SM about us */
-- 
1.6.0.3.517.g759a