[ofa-general] [PATCH] opensm: remove unused states and sm signals

[Sasha Khapyorsky]

Remove unused OSM_SM_STATE_LOST_NEGOTIATION state and
OSM_SIGNAL_LOST_SM_NEGOTIATION sm signal.

Signed-off-by: Sasha Khapyorsky <sashak at voltaire.com>
---
 opensm/include/opensm/osm_base.h |   16 +++++++---------
 opensm/opensm/osm_console.c      |    2 --
 opensm/opensm/osm_helper.c       |   36 +++++++++++++++++-------------------
 3 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/opensm/include/opensm/osm_base.h b/opensm/include/opensm/osm_base.h
index f1f3491..aaf9930 100644
--- a/opensm/include/opensm/osm_base.h
+++ b/opensm/include/opensm/osm_base.h
@@ -777,7 +777,6 @@ typedef enum _osm_sm_state {
 	OSM_SM_STATE_SET_ARMED_DONE,
 	OSM_SM_STATE_SET_ACTIVE,
 	OSM_SM_STATE_SET_ACTIVE_WAIT,
-	OSM_SM_STATE_LOST_NEGOTIATION,
 	OSM_SM_STATE_STANDBY,
 	OSM_SM_STATE_SUBNET_UP,
 	OSM_SM_STATE_PROCESS_REQUEST,
@@ -809,14 +808,13 @@ typedef enum _osm_sm_state {
 #define OSM_SIGNAL_NO_PENDING_TRANSACTIONS	3
 #define OSM_SIGNAL_DONE				4
 #define OSM_SIGNAL_DONE_PENDING			5
-#define OSM_SIGNAL_LOST_SM_NEGOTIATION		6
-#define OSM_SIGNAL_LIGHT_SWEEP_FAIL		7
-#define OSM_SIGNAL_IDLE_TIME_PROCESS		8
-#define OSM_SIGNAL_IDLE_TIME_PROCESS_REQUEST	9
-#define OSM_SIGNAL_MASTER_OR_HIGHER_SM_DETECTED	10
-#define OSM_SIGNAL_EXIT_STBY			11
-#define OSM_SIGNAL_PERFMGR_SWEEP		12
-#define OSM_SIGNAL_MAX				13
+#define OSM_SIGNAL_LIGHT_SWEEP_FAIL		6
+#define OSM_SIGNAL_IDLE_TIME_PROCESS		7
+#define OSM_SIGNAL_IDLE_TIME_PROCESS_REQUEST	8
+#define OSM_SIGNAL_MASTER_OR_HIGHER_SM_DETECTED	9
+#define OSM_SIGNAL_EXIT_STBY			10
+#define OSM_SIGNAL_PERFMGR_SWEEP		11
+#define OSM_SIGNAL_MAX				12
 
 typedef uintn_t osm_signal_t;
 /***********/
diff --git a/opensm/opensm/osm_console.c b/opensm/opensm/osm_console.c
index f699ec3..d0a632f 100644
--- a/opensm/opensm/osm_console.c
+++ b/opensm/opensm/osm_console.c
@@ -348,8 +348,6 @@ static char *sm_state_mgr_str(osm_sm_state_t state)
 		return ("Set Active");
 	case OSM_SM_STATE_SET_ACTIVE_WAIT:
 		return ("Set Active Wait");
-	case OSM_SM_STATE_LOST_NEGOTIATION:
-		return ("Lost Negotiation");
 	case OSM_SM_STATE_STANDBY:
 		return ("Standby");
 	case OSM_SM_STATE_SUBNET_UP:
diff --git a/opensm/opensm/osm_helper.c b/opensm/opensm/osm_helper.c
index 95c702c..1ea86b9 100644
--- a/opensm/opensm/osm_helper.c
+++ b/opensm/opensm/osm_helper.c
@@ -2086,17 +2086,16 @@ const char *const __osm_sm_state_str[] = {
 	"OSM_SM_STATE_SET_ARMED_DONE",	/* 24 */
 	"OSM_SM_STATE_SET_ACTIVE",	/* 25 */
 	"OSM_SM_STATE_SET_ACTIVE_WAIT",	/* 26 */
-	"OSM_SM_STATE_LOST_NEGOTIATION",	/* 27 */
-	"OSM_SM_STATE_STANDBY",	/* 28 */
-	"OSM_SM_STATE_SUBNET_UP",	/* 29 */
-	"OSM_SM_STATE_PROCESS_REQUEST",	/* 30 */
-	"OSM_SM_STATE_PROCESS_REQUEST_WAIT",	/* 31 */
-	"OSM_SM_STATE_PROCESS_REQUEST_DONE",	/* 32 */
-	"OSM_SM_STATE_MASTER_OR_HIGHER_SM_DETECTED",	/* 33 */
-	"OSM_SM_STATE_SET_PKEY",	/* 34 */
-	"OSM_SM_STATE_SET_PKEY_WAIT",	/* 35 */
-	"OSM_SM_STATE_SET_PKEY_DONE",	/* 36 */
-	"UNKNOWN STATE!!"	/* 37 */
+	"OSM_SM_STATE_STANDBY",	/* 27 */
+	"OSM_SM_STATE_SUBNET_UP",	/* 28 */
+	"OSM_SM_STATE_PROCESS_REQUEST",	/* 29 */
+	"OSM_SM_STATE_PROCESS_REQUEST_WAIT",	/* 30 */
+	"OSM_SM_STATE_PROCESS_REQUEST_DONE",	/* 31 */
+	"OSM_SM_STATE_MASTER_OR_HIGHER_SM_DETECTED",	/* 32 */
+	"OSM_SM_STATE_SET_PKEY",	/* 33 */
+	"OSM_SM_STATE_SET_PKEY_WAIT",	/* 34 */
+	"OSM_SM_STATE_SET_PKEY_DONE",	/* 35 */
+	"UNKNOWN STATE!!"	/* 36 */
 };
 
 const char *const __osm_sm_signal_str[] = {
@@ -2106,14 +2105,13 @@ const char *const __osm_sm_signal_str[] = {
 	"OSM_SIGNAL_NO_PENDING_TRANSACTIONS",	/* 3 */
 	"OSM_SIGNAL_DONE",	/* 4 */
 	"OSM_SIGNAL_DONE_PENDING",	/* 5 */
-	"OSM_SIGNAL_LOST_SM_NEGOTIATION",	/* 6 */
-	"OSM_SIGNAL_LIGHT_SWEEP_FAIL",	/* 7 */
-	"OSM_SIGNAL_IDLE_TIME_PROCESS",	/* 8 */
-	"OSM_SIGNAL_IDLE_TIME_PROCESS_REQUEST",	/* 9 */
-	"OSM_SIGNAL_MASTER_OR_HIGHER_SM_DETECTED",	/* 10 */
-	"OSM_SIGNAL_EXIT_STBY",	/* 11 */
-	"OSM_SIGNAL_PERFMGR_SWEEP",	/* 12 */
-	"UNKNOWN SIGNAL!!"	/* 13 */
+	"OSM_SIGNAL_LIGHT_SWEEP_FAIL",	/* 6 */
+	"OSM_SIGNAL_IDLE_TIME_PROCESS",	/* 7 */
+	"OSM_SIGNAL_IDLE_TIME_PROCESS_REQUEST",	/* 8 */
+	"OSM_SIGNAL_MASTER_OR_HIGHER_SM_DETECTED",	/* 9 */
+	"OSM_SIGNAL_EXIT_STBY",	/* 10 */
+	"OSM_SIGNAL_PERFMGR_SWEEP",	/* 11 */
+	"UNKNOWN SIGNAL!!"	/* 12 */
 };
 
 /**********************************************************************
-- 
1.5.4.rc5