[ofa-general] [PATCH] opensm: move OpenSM constants from osm_sa_mcmember-record.h to osm_base.h

[Sasha Khapyorsky]

Move OpenSM constants OSM_DEFAULT_MGRP_* from osm_sa_mcmember-record.h to
osm_base.h.

Signed-off-by: Sasha Khapyorsky <sashak at voltaire.com>
---
 opensm/include/opensm/osm_base.h               |   35 ++++++++++++++++++++++
 opensm/include/opensm/osm_sa_mcmember_record.h |   38 ------------------------
 2 files changed, 35 insertions(+), 38 deletions(-)

diff --git a/opensm/include/opensm/osm_base.h b/opensm/include/opensm/osm_base.h
index 9d0318e..f1f3491 100644
--- a/opensm/include/opensm/osm_base.h
+++ b/opensm/include/opensm/osm_base.h
@@ -512,6 +512,41 @@ BEGIN_C_DECLS
 */
 #define OSM_SM_DEFAULT_POLLING_RETRY_NUMBER 4
 /**********/
+/****d* OpenSM: MC Member Record Receiver/OSM_DEFAULT_MGRP_MTU
+* Name
+*	OSM_DEFAULT_MGRP_MTU
+*
+* DESCRIPTION
+*	Default MTU used for new MGRP creation (2048 bytes)
+*  Note it includes the MTUSelector which is set to "Greater Than"
+*
+* SYNOPSIS
+*/
+#define OSM_DEFAULT_MGRP_MTU 0x04
+/***********/
+/****d* OpenSM: MC Member Record Receiver/OSM_DEFAULT_MGRP_RATE
+* Name
+*	OSM_DEFAULT_MGRP_RATE
+*
+* DESCRIPTION
+*	Default RATE used for new MGRP creation (10Gb/sec)
+*  Note it includes the RateSelector which is set to "Greater Than"
+*
+* SYNOPSIS
+*/
+#define OSM_DEFAULT_MGRP_RATE 0x03
+/***********/
+/****d* OpenSM: MC Member Record Receiver/OSM_DEFAULT_MGRP_SCOPE
+* Name
+*	OSM_DEFAULT_MGRP_SCOPE
+*
+* DESCRIPTION
+*	Default SCOPE used for new MGRP creation (link local)
+*
+* SYNOPSIS
+*/
+#define OSM_DEFAULT_MGRP_SCOPE IB_MC_SCOPE_LINK_LOCAL
+/***********/
 /****d* OpenSM: Base/OSM_DEFAULT_QOS_MAX_VLS
  * Name
  *       OSM_DEFAULT_QOS_MAX_VLS
diff --git a/opensm/include/opensm/osm_sa_mcmember_record.h b/opensm/include/opensm/osm_sa_mcmember_record.h
index dfe423c..f13bc98 100644
--- a/opensm/include/opensm/osm_sa_mcmember_record.h
+++ b/opensm/include/opensm/osm_sa_mcmember_record.h
@@ -353,43 +353,5 @@ osm_mcmr_rcv_find_or_create_new_mgrp(IN osm_mcmr_recv_t * const p_mcmr,
 										IB_MCR_COMPMASK_FLOW		| \
 										IB_MCR_COMPMASK_SL)
 
-/****d* OpenSM: MC Member Record Receiver/OSM_DEFAULT_MGRP_MTU
-* Name
-*	OSM_DEFAULT_MGRP_MTU
-*
-* DESCRIPTION
-*	Default MTU used for new MGRP creation (2048 bytes)
-*  Note it includes the MTUSelector which is set to "Greater Than"
-*
-* SYNOPSIS
-*/
-#define OSM_DEFAULT_MGRP_MTU 0x04
-/***********/
-
-/****d* OpenSM: MC Member Record Receiver/OSM_DEFAULT_MGRP_RATE
-* Name
-*	OSM_DEFAULT_MGRP_RATE
-*
-* DESCRIPTION
-*	Default RATE used for new MGRP creation (10Gb/sec)
-*  Note it includes the RateSelector which is set to "Greater Than"
-*
-* SYNOPSIS
-*/
-#define OSM_DEFAULT_MGRP_RATE 0x03
-/***********/
-
-/****d* OpenSM: MC Member Record Receiver/OSM_DEFAULT_MGRP_SCOPE
-* Name
-*	OSM_DEFAULT_MGRP_SCOPE
-*
-* DESCRIPTION
-*	Default SCOPE used for new MGRP creation (link local)
-*
-* SYNOPSIS
-*/
-#define OSM_DEFAULT_MGRP_SCOPE IB_MC_SCOPE_LINK_LOCAL
-/***********/
-
 END_C_DECLS
 #endif				/* _OSM_MCMR_H_ */
-- 
1.5.3.4.206.g58ba4