[ofa-general] [PATCH] opensm: clean unused OSM_SM_SIGNAL_MASTER_OR_HIGHER_SM_DETECTED

[Sasha Khapyorsky]

This removes unused OSM_SM_SIGNAL_MASTER_OR_HIGHER_SM_DETECTED sm signal
enum value.

Signed-off-by: Sasha Khapyorsky <sashak at voltaire.com>
---
 opensm/include/opensm/osm_base.h |    1 -
 opensm/opensm/osm_helper.c       |    7 +++----
 opensm/opensm/osm_sm_state_mgr.c |    8 --------
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/opensm/include/opensm/osm_base.h b/opensm/include/opensm/osm_base.h
index 6bdea24..9a50d7d 100644
--- a/opensm/include/opensm/osm_base.h
+++ b/opensm/include/opensm/osm_base.h
@@ -788,7 +788,6 @@ 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,
   OSM_SM_SIGNAL_MASTER_OR_HIGHER_SM_DETECTED_DONE,
   OSM_SM_SIGNAL_WAIT_FOR_HANDOVER,
   OSM_SM_SIGNAL_MAX
diff --git a/opensm/opensm/osm_helper.c b/opensm/opensm/osm_helper.c
index 3745b55..724ecdf 100644
--- a/opensm/opensm/osm_helper.c
+++ b/opensm/opensm/osm_helper.c
@@ -2501,10 +2501,9 @@ 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",        /* 10 */
-  "OSM_SM_SIGNAL_MASTER_OR_HIGHER_SM_DETECTED_DONE",    /* 11 */
-  "OSM_SM_SIGNAL_WAIT_FOR_HANDOVER",     /* 12 */
-  "UNKNOWN STATE!!"                      /* 13 */
+  "OSM_SM_SIGNAL_MASTER_OR_HIGHER_SM_DETECTED_DONE",    /* 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 07c2af3..ccfb8b0 100644
--- a/opensm/opensm/osm_sm_state_mgr.c
+++ b/opensm/opensm/osm_sm_state_mgr.c
@@ -575,13 +575,6 @@ osm_sm_state_mgr_process(
           */
          p_sm_mgr->p_subn->master_sm_base_lid = p_sm_mgr->p_subn->sm_base_lid;
          break;
-      case OSM_SM_SIGNAL_MASTER_OR_HIGHER_SM_DETECTED:
-         /*
-          * Stop the discovering
-          */
-         osm_state_mgr_process( p_sm_mgr->p_state_mgr,
-                                OSM_SIGNAL_MASTER_OR_HIGHER_SM_DETECTED );
-         break;
       case OSM_SM_SIGNAL_MASTER_OR_HIGHER_SM_DETECTED_DONE:
          /*
           * Finished all discovery actions - move to STANDBY
@@ -813,7 +806,6 @@ osm_sm_state_mgr_check_legality(
       switch ( signal )
       {
       case OSM_SM_SIGNAL_DISCOVERY_COMPLETED:
-      case OSM_SM_SIGNAL_MASTER_OR_HIGHER_SM_DETECTED:
       case OSM_SM_SIGNAL_MASTER_OR_HIGHER_SM_DETECTED_DONE:
       case OSM_SM_SIGNAL_HANDOVER:
          status = IB_SUCCESS;
-- 
1.5.2.1.137.g426c