[ofa-general] [PATCH] opensm/include/opensm: indentation changes

Sasha Khapyorsky sashak at voltaire.com
Wed Aug 15 15:22:10 PDT 2007


Formatted with opensm/osm_indent
(indent -npro -kr -i8 -ts8 -sob -l80 -ss -ncs)

Signed-off-by: Sasha Khapyorsky <sashak at voltaire.com>
---
 opensm/include/opensm/osm_attrib_req.h          |   23 +-
 opensm/include/opensm/osm_base.h                |   96 ++----
 opensm/include/opensm/osm_console.h             |   16 +-
 opensm/include/opensm/osm_db.h                  |   72 +---
 opensm/include/opensm/osm_db_pack.h             |   44 +--
 opensm/include/opensm/osm_drop_mgr.h            |   40 +--
 opensm/include/opensm/osm_errors.h              |    2 +-
 opensm/include/opensm/osm_event_plugin.h        |  118 +++---
 opensm/include/opensm/osm_fwd_tbl.h             |  113 +++---
 opensm/include/opensm/osm_helper.h              |  270 +++++--------
 opensm/include/opensm/osm_inform.h              |   56 +--
 opensm/include/opensm/osm_lid_mgr.h             |   59 +--
 opensm/include/opensm/osm_lin_fwd_rcv.h         |   37 +--
 opensm/include/opensm/osm_lin_fwd_tbl.h         |   96 ++---
 opensm/include/opensm/osm_link_mgr.h            |   45 +--
 opensm/include/opensm/osm_log.h                 |  113 +++---
 opensm/include/opensm/osm_mad_pool.h            |   67 ++--
 opensm/include/opensm/osm_madw.h                |  427 ++++++++++-----------
 opensm/include/opensm/osm_mcast_fwd_rcv.h       |   39 +--
 opensm/include/opensm/osm_mcast_mgr.h           |   56 +--
 opensm/include/opensm/osm_mcast_tbl.h           |   96 ++---
 opensm/include/opensm/osm_mcm_info.h            |   23 +-
 opensm/include/opensm/osm_mcm_port.h            |   31 +-
 opensm/include/opensm/osm_msgdef.h              |   16 +-
 opensm/include/opensm/osm_mtree.h               |   59 ++--
 opensm/include/opensm/osm_multicast.h           |  143 +++----
 opensm/include/opensm/osm_node.h                |  179 ++++-----
 opensm/include/opensm/osm_node_desc_rcv.h       |   37 +--
 opensm/include/opensm/osm_node_info_rcv.h       |   48 +--
 opensm/include/opensm/osm_opensm.h              |  109 +++---
 opensm/include/opensm/osm_partition.h           |   45 +--
 opensm/include/opensm/osm_path.h                |   55 +--
 opensm/include/opensm/osm_perfmgr.h             |  190 +++++-----
 opensm/include/opensm/osm_perfmgr_db.h          |  149 ++++----
 opensm/include/opensm/osm_pkey.h                |  160 ++++-----
 opensm/include/opensm/osm_pkey_mgr.h            |   12 +-
 opensm/include/opensm/osm_pkey_rcv.h            |   41 +--
 opensm/include/opensm/osm_port.h                |  479 +++++++++++------------
 opensm/include/opensm/osm_port_info_rcv.h       |   45 +--
 opensm/include/opensm/osm_port_profile.h        |   92 ++---
 opensm/include/opensm/osm_rand_fwd_tbl.h        |  105 +++---
 opensm/include/opensm/osm_remote_sm.h           |   33 +-
 opensm/include/opensm/osm_req.h                 |   72 ++--
 opensm/include/opensm/osm_resp.h                |   46 +--
 opensm/include/opensm/osm_router.h              |   40 +--
 opensm/include/opensm/osm_sa.h                  |  141 +++----
 opensm/include/opensm/osm_sa_class_port_info.h  |   47 +--
 opensm/include/opensm/osm_sa_guidinfo_record.h  |   49 +--
 opensm/include/opensm/osm_sa_informinfo.h       |   54 +--
 opensm/include/opensm/osm_sa_lft_record.h       |   49 +--
 opensm/include/opensm/osm_sa_link_record.h      |   48 +--
 opensm/include/opensm/osm_sa_mad_ctrl.h         |   68 ++--
 opensm/include/opensm/osm_sa_mcmember_record.h  |   80 ++---
 opensm/include/opensm/osm_sa_mft_record.h       |   49 +--
 opensm/include/opensm/osm_sa_multipath_record.h |   49 +--
 opensm/include/opensm/osm_sa_node_record.h      |   48 +--
 opensm/include/opensm/osm_sa_path_record.h      |   49 +--
 opensm/include/opensm/osm_sa_pkey_record.h      |   49 +--
 opensm/include/opensm/osm_sa_portinfo_record.h  |   49 +--
 opensm/include/opensm/osm_sa_response.h         |   37 +--
 opensm/include/opensm/osm_sa_service_record.h   |   55 +--
 opensm/include/opensm/osm_sa_slvl_record.h      |   49 +--
 opensm/include/opensm/osm_sa_sminfo_record.h    |   50 +--
 opensm/include/opensm/osm_sa_sw_info_record.h   |   54 +--
 opensm/include/opensm/osm_sa_vlarb_record.h     |   50 +--
 opensm/include/opensm/osm_service.h             |   54 +--
 opensm/include/opensm/osm_slvl_map_rcv.h        |   41 +--
 opensm/include/opensm/osm_sm.h                  |  173 ++++-----
 opensm/include/opensm/osm_sm_mad_ctrl.h         |   70 ++--
 opensm/include/opensm/osm_sm_state_mgr.h        |   62 ++--
 opensm/include/opensm/osm_sminfo_rcv.h          |   54 ++--
 opensm/include/opensm/osm_state_mgr.h           |  156 +++-----
 opensm/include/opensm/osm_state_mgr_ctrl.h      |   37 +--
 opensm/include/opensm/osm_stats.h               |   28 +-
 opensm/include/opensm/osm_subnet.h              |  342 ++++++++---------
 opensm/include/opensm/osm_sw_info_rcv.h         |   48 +--
 opensm/include/opensm/osm_sweep_fail_ctrl.h     |   38 +--
 opensm/include/opensm/osm_switch.h              |  315 +++++++--------
 opensm/include/opensm/osm_trap_rcv.h            |   57 ++--
 opensm/include/opensm/osm_ts_useraccess.h       |   14 +-
 opensm/include/opensm/osm_ucast_mgr.h           |   65 ++--
 opensm/include/opensm/osm_umadt.h               |   61 ++--
 opensm/include/opensm/osm_version.h             |    9 +-
 opensm/include/opensm/osm_vl15intf.h            |   82 ++---
 opensm/include/opensm/osm_vl_arb_rcv.h          |   41 +--
 opensm/include/opensm/st.h                      |   27 +-
 86 files changed, 2960 insertions(+), 4032 deletions(-)

diff --git a/opensm/include/opensm/osm_attrib_req.h b/opensm/include/opensm/osm_attrib_req.h
index 97cd4dc..be993a5 100644
--- a/opensm/include/opensm/osm_attrib_req.h
+++ b/opensm/include/opensm/osm_attrib_req.h
@@ -41,13 +41,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /*
  * Abstract:
  * 	Declaration of the attribute request object.  This object
@@ -60,7 +59,6 @@ BEGIN_C_DECLS
  *
  * $Revision: 1.4 $
  */
-
 /****h* OpenSM/Attribute Request
 * NAME
 *	Attribute Request
@@ -76,7 +74,6 @@ BEGIN_C_DECLS
 *	Steve King, Intel
 *
 *********/
-
 /****s* OpenSM: Attribute Request/osm_attrib_req_t
 * NAME
 *	osm_attrib_req_t
@@ -88,13 +85,12 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_attrib_req
-{
-	uint16_t				attrib_id;
-	uint32_t				attrib_mod;
-	osm_madw_context_t		context;
-	osm_dr_path_t			path;
-	cl_disp_msgid_t			err_msg;
+typedef struct _osm_attrib_req {
+	uint16_t attrib_id;
+	uint32_t attrib_mod;
+	osm_madw_context_t context;
+	osm_dr_path_t path;
+	cl_disp_msgid_t err_msg;
 
 } osm_attrib_req_t;
 /*
@@ -115,5 +111,4 @@ typedef struct _osm_attrib_req
 *********/
 
 END_C_DECLS
-
-#endif		/* _OSM_ATTRIB_REQ_H_ */
+#endif				/* _OSM_ATTRIB_REQ_H_ */
diff --git a/opensm/include/opensm/osm_base.h b/opensm/include/opensm/osm_base.h
index 4bf766e..545779b 100644
--- a/opensm/include/opensm/osm_base.h
+++ b/opensm/include/opensm/osm_base.h
@@ -60,13 +60,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/Constants
 * NAME
 *	Constants
@@ -78,7 +77,6 @@ BEGIN_C_DECLS
 *	Steve King, Intel
 *
 *********/
-
 /****h* OpenSM/Base
 * NAME
 *	Base
@@ -95,7 +93,6 @@ BEGIN_C_DECLS
 *	Steve King, Intel
 *
 *********/
-
 /****s* OpenSM: Base/OSM_DEFAULT_M_KEY
 * NAME
 *	OSM_DEFAULT_M_KEY
@@ -107,7 +104,6 @@ BEGIN_C_DECLS
 */
 #define OSM_DEFAULT_M_KEY 0
 /********/
-
 /****s* OpenSM: Base/OSM_DEFAULT_SM_KEY
 * NAME
 *	OSM_DEFAULT_SM_KEY
@@ -119,7 +115,6 @@ BEGIN_C_DECLS
 */
 #define OSM_DEFAULT_SM_KEY 1
 /********/
-
 /****s* OpenSM: Base/OSM_DEFAULT_LMC
 * NAME
 *	OSM_DEFAULT_LMC
@@ -131,7 +126,6 @@ BEGIN_C_DECLS
 */
 #define OSM_DEFAULT_LMC 0
 /********/
-
 /****s* OpenSM: Base/OSM_DEFAULT_MAX_OP_VLS
 * NAME
 *	OSM_DEFAULT_MAX_OP_VLS
@@ -145,7 +139,6 @@ BEGIN_C_DECLS
 */
 #define OSM_DEFAULT_MAX_OP_VLS 5
 /********/
-
 /****s* OpenSM: Base/OSM_DEFAULT_SL
 * NAME
 *	OSM_DEFAULT_SL
@@ -157,7 +150,6 @@ BEGIN_C_DECLS
 */
 #define OSM_DEFAULT_SL 0
 /********/
-
 /****s* OpenSM: Base/OSM_DEFAULT_SM_PRIORITY
 * NAME
 *	OSM_DEFAULT_SM_PRIORITY
@@ -170,7 +162,6 @@ BEGIN_C_DECLS
 */
 #define OSM_DEFAULT_SM_PRIORITY 0
 /********/
-
 /****d* OpenSM: Base/OSM_DEFAULT_TMP_DIR
 * NAME
 *	OSM_DEFAULT_TMP_DIR
@@ -187,7 +178,6 @@ BEGIN_C_DECLS
 #define OSM_DEFAULT_TMP_DIR "/var/log/"
 #endif
 /***********/
-
 /****d* OpenSM: Base/OSM_DEFAULT_CACHE_DIR
 * NAME
 *	OSM_DEFAULT_CACHE_DIR
@@ -204,7 +194,6 @@ BEGIN_C_DECLS
 #define OSM_DEFAULT_CACHE_DIR "/var/cache/opensm/"
 #endif
 /***********/
-
 /****d* OpenSM: Base/OSM_DEFAULT_LOG_FILE
 * NAME
 *	OSM_DEFAULT_LOG_FILE
@@ -220,7 +209,6 @@ BEGIN_C_DECLS
 #define OSM_DEFAULT_LOG_FILE "/var/log/opensm.log"
 #endif
 /***********/
-
 /****d* OpenSM: Base/OSM_DEFAULT_PARTITION_CONFIG_FILE
 * NAME
 *	OSM_DEFAULT_PARTITION_CONFIG_FILE
@@ -236,7 +224,6 @@ BEGIN_C_DECLS
 #define OSM_DEFAULT_PARTITION_CONFIG_FILE "/etc/ofa/opensm-partitions.conf"
 #endif
 /***********/
-
 /****d* OpenSM: Base/OSM_DEFAULT_SWEEP_INTERVAL_SECS
 * NAME
 *	OSM_DEFAULT_SWEEP_INTERVAL_SECS
@@ -248,7 +235,6 @@ BEGIN_C_DECLS
 */
 #define OSM_DEFAULT_SWEEP_INTERVAL_SECS 10
 /***********/
-
 /****d* OpenSM: Base/OSM_DEFAULT_TRANS_TIMEOUT_MILLISEC
 * NAME
 *	OSM_DEFAULT_TRANS_TIMEOUT_MILLISEC
@@ -260,7 +246,6 @@ BEGIN_C_DECLS
 */
 #define OSM_DEFAULT_TRANS_TIMEOUT_MILLISEC 200
 /***********/
-
 /****d* OpenSM: Base/OSM_DEFAULT_SUBNET_TIMEOUT
 * NAME
 *	OSM_DEFAULT_SUBNET_TIMEOUT
@@ -274,7 +259,6 @@ BEGIN_C_DECLS
 */
 #define OSM_DEFAULT_SUBNET_TIMEOUT 0x12
 /***********/
-
 /****d* OpenSM: Base/OSM_DEFAULT_SWITCH_PACKET_LIFE
 * NAME
 *	OSM_DEFAULT_SWITCH_PACKET_LIFE
@@ -289,7 +273,6 @@ BEGIN_C_DECLS
 */
 #define OSM_DEFAULT_SWITCH_PACKET_LIFE 0x12
 /***********/
-
 /****d* OpenSM: Base/OSM_DEFAULT_HEAD_OF_QUEUE_LIFE
 * NAME
 *	OSM_DEFAULT_HEAD_OF_QUEUE_LIFE
@@ -303,7 +286,6 @@ BEGIN_C_DECLS
 */
 #define OSM_DEFAULT_HEAD_OF_QUEUE_LIFE 0x12
 /***********/
-
 /****d* OpenSM: Base/OSM_DEFAULT_LEAF_HEAD_OF_QUEUE_LIFE
 * NAME
 *	OSM_DEFAULT_LEAF_HEAD_OF_QUEUE_LIFE
@@ -317,7 +299,6 @@ BEGIN_C_DECLS
 */
 #define OSM_DEFAULT_LEAF_HEAD_OF_QUEUE_LIFE 0x10
 /***********/
-
 /****d* OpenSM: Base/OSM_DEFAULT_VL_STALL_COUNT
 * NAME
 *	OSM_DEFAULT_LEAF_VL_COUNT
@@ -331,7 +312,6 @@ BEGIN_C_DECLS
 */
 #define OSM_DEFAULT_VL_STALL_COUNT 0x7
 /***********/
-
 /****d* OpenSM: Base/OSM_DEFAULT_LEAF_VL_STALL_COUNT
 * NAME
 *	OSM_DEFAULT_LEAF_VL_STALL_COUNT
@@ -346,7 +326,6 @@ BEGIN_C_DECLS
 */
 #define OSM_DEFAULT_LEAF_VL_STALL_COUNT 0x7
 /***********/
-
 /****d* OpenSM: Base/OSM_DEFAULT_TRAP_SUPRESSION_TIMEOUT
 * NAME
 *	OSM_DEFAULT_TRAP_SUPRESSION_TIMEOUT
@@ -360,7 +339,6 @@ BEGIN_C_DECLS
 */
 #define OSM_DEFAULT_TRAP_SUPRESSION_TIMEOUT 5000000
 /***********/
-
 /****d* OpenSM: Base/OSM_DEFAULT_UNHEALTHY_TIMEOUT
 * NAME
 *	OSM_DEFAULT_UNHEALTHY_TIMEOUT
@@ -374,7 +352,6 @@ BEGIN_C_DECLS
 */
 #define OSM_DEFAULT_UNHEALTHY_TIMEOUT 60000000
 /***********/
-
 /****d* OpenSM: Base/OSM_DEFAULT_ERROR_THRESHOLD
 * NAME
 *	OSM_DEFAULT_ERROR_THRESHOLD
@@ -386,7 +363,6 @@ BEGIN_C_DECLS
 */
 #define OSM_DEFAULT_ERROR_THRESHOLD 0x08
 /***********/
-
 /****d* OpenSM: Base/OSM_DEFAULT_SMP_MAX_ON_WIRE
 * NAME
 *	OSM_DEFAULT_SMP_MAX_ON_WIRE
@@ -399,7 +375,6 @@ BEGIN_C_DECLS
 */
 #define OSM_DEFAULT_SMP_MAX_ON_WIRE 4
 /***********/
-
 /****d* OpenSM: Base/OSM_SM_DEFAULT_QP0_RCV_SIZE
 * NAME
 *	OSM_SM_DEFAULT_QP0_RCV_SIZE
@@ -411,7 +386,6 @@ BEGIN_C_DECLS
 */
 #define OSM_SM_DEFAULT_QP0_RCV_SIZE 256
 /***********/
-
 /****d* OpenSM: Base/OSM_SM_DEFAULT_QP0_SEND_SIZE
 * NAME
 *	OSM_SM_DEFAULT_QP0_SEND_SIZE
@@ -423,7 +397,6 @@ BEGIN_C_DECLS
 */
 #define OSM_SM_DEFAULT_QP0_SEND_SIZE 256
 /***********/
-
 /****d* OpenSM: Base/OSM_SM_DEFAULT_QP1_RCV_SIZE
 * NAME
 *   OSM_SM_DEFAULT_QP1_RCV_SIZE
@@ -435,7 +408,6 @@ BEGIN_C_DECLS
 */
 #define OSM_SM_DEFAULT_QP1_RCV_SIZE 256
 /***********/
-
 /****d* OpenSM: Base/OSM_SM_DEFAULT_QP1_SEND_SIZE
 * NAME
 *   OSM_SM_DEFAULT_QP1_SEND_SIZE
@@ -446,7 +418,6 @@ BEGIN_C_DECLS
 * SYNOPSIS
 */
 #define OSM_SM_DEFAULT_QP1_SEND_SIZE 256
-
 /****d* OpenSM: Base/OSM_PM_DEFAULT_QP1_RCV_SIZE
 * NAME
 *   OSM_PM_DEFAULT_QP1_RCV_SIZE
@@ -458,7 +429,6 @@ BEGIN_C_DECLS
 */
 #define OSM_PM_DEFAULT_QP1_RCV_SIZE 256
 /***********/
-
 /****d* OpenSM: Base/OSM_PM_DEFAULT_QP1_SEND_SIZE
 * NAME
 *   OSM_PM_DEFAULT_QP1_SEND_SIZE
@@ -469,8 +439,6 @@ BEGIN_C_DECLS
 * SYNOPSIS
 */
 #define OSM_PM_DEFAULT_QP1_SEND_SIZE 256
-
-
 /****d* OpenSM: Base/OSM_SM_DEFAULT_POLLING_TIMEOUT_MILLISECS
 * NAME
 *   OSM_SM_DEFAULT_POLLING_TIMEOUT_MILLISECS
@@ -483,7 +451,6 @@ BEGIN_C_DECLS
 */
 #define OSM_SM_DEFAULT_POLLING_TIMEOUT_MILLISECS 10000
 /**********/
-
 /****d* OpenSM: Base/OSM_SM_DEFAULT_POLLING_RETRY_NUMBER
 * NAME
 *   OSM_SM_DEFAULT_POLLING_RETRY_NUMBER
@@ -496,7 +463,6 @@ BEGIN_C_DECLS
 */
 #define OSM_SM_DEFAULT_POLLING_RETRY_NUMBER 4
 /**********/
-
 /****d* OpenSM: Base/OSM_DEFAULT_QOS_MAX_VLS
  * Name
  *       OSM_DEFAULT_QOS_MAX_VLS
@@ -508,7 +474,6 @@ BEGIN_C_DECLS
  */
 #define OSM_DEFAULT_QOS_MAX_VLS 15
 /***********/
-
 /****d* OpenSM: Base/OSM_DEFAULT_QOS_HIGH_LIMIT
  * Name
  *       OSM_DEFAULT_QOS_HIGH_LIMIT
@@ -520,7 +485,6 @@ BEGIN_C_DECLS
  */
 #define OSM_DEFAULT_QOS_HIGH_LIMIT 0
 /***********/
-
 /****d* OpenSM: Base/OSM_DEFAULT_QOS_VLARB_HIGH
  * Name
  *       OSM_DEFAULT_QOS_VLARB_HIGH
@@ -532,7 +496,6 @@ BEGIN_C_DECLS
  */
 #define OSM_DEFAULT_QOS_VLARB_HIGH "0:4,1:0,2:0,3:0,4:0,5:0,6:0,7:0,8:0,9:0,10:0,11:0,12:0,13:0,14:0"
 /***********/
-
 /****d* OpenSM: Base/OSM_DEFAULT_QOS_VLARB_LOW
  * Name
  *       OSM_DEFAULT_QOS_VLARB_LOW
@@ -544,7 +507,6 @@ BEGIN_C_DECLS
  */
 #define OSM_DEFAULT_QOS_VLARB_LOW "0:0,1:4,2:4,3:4,4:4,5:4,6:4,7:4,8:4,9:4,10:4,11:4,12:4,13:4,14:4"
 /***********/
-
 /****d* OpenSM: Base/OSM_DEFAULT_QOS_SL2VL
  * Name
  *       OSM_DEFAULT_QOS_SL2VL
@@ -556,7 +518,6 @@ BEGIN_C_DECLS
  */
 #define OSM_DEFAULT_QOS_SL2VL "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,7"
 /***********/
-
 /****d* OpenSM: Base/OSM_NO_PATH
 * NAME
 *	OSM_NO_PATH
@@ -568,7 +529,6 @@ BEGIN_C_DECLS
 */
 #define OSM_NO_PATH			0xFF
 /**********/
-
 /****d* OpenSM: Base/osm_thread_state_t
 * NAME
 *	osm_thread_state_t
@@ -579,13 +539,11 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef enum _osm_thread_state
-{
+typedef enum _osm_thread_state {
 	OSM_THREAD_STATE_NONE = 0,
 	OSM_THREAD_STATE_INIT,
 	OSM_THREAD_STATE_RUN,
 	OSM_THREAD_STATE_EXIT
-
 } osm_thread_state_t;
 /***********/
 
@@ -695,8 +653,7 @@ typedef enum _osm_thread_state
 *
 * SYNOPSIS
 */
-typedef enum _osm_sm_state
-{
+typedef enum _osm_sm_state {
 	OSM_SM_STATE_NO_STATE = 0,
 	OSM_SM_STATE_INIT,
 	OSM_SM_STATE_IDLE,
@@ -776,21 +733,19 @@ typedef uintn_t osm_signal_t;
 *
 * SYNOPSIS
 */
-typedef enum _osm_sm_signal
-{
-  OSM_SM_SIGNAL_INIT = 0,
-  OSM_SM_SIGNAL_DISCOVERY_COMPLETED,
-  OSM_SM_SIGNAL_POLLING_TIMEOUT,
-  OSM_SM_SIGNAL_DISCOVER,
-  OSM_SM_SIGNAL_DISABLE,
-  OSM_SM_SIGNAL_HANDOVER,
-  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_WAIT_FOR_HANDOVER,
-  OSM_SM_SIGNAL_MAX
-
+typedef enum _osm_sm_signal {
+	OSM_SM_SIGNAL_INIT = 0,
+	OSM_SM_SIGNAL_DISCOVERY_COMPLETED,
+	OSM_SM_SIGNAL_POLLING_TIMEOUT,
+	OSM_SM_SIGNAL_DISCOVER,
+	OSM_SM_SIGNAL_DISABLE,
+	OSM_SM_SIGNAL_HANDOVER,
+	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_WAIT_FOR_HANDOVER,
+	OSM_SM_SIGNAL_MAX
 } osm_sm_signal_t;
 /***********/
 
@@ -803,14 +758,12 @@ typedef enum _osm_sm_signal
 *
 * SYNOPSIS
 */
-typedef enum _osm_mcast_req_type
-{
-  OSM_MCAST_REQ_TYPE_CREATE,
-  OSM_MCAST_REQ_TYPE_JOIN,
-  OSM_MCAST_REQ_TYPE_LEAVE,
-  OSM_MCAST_REQ_TYPE_SUBNET_CHANGE
-
-}	osm_mcast_req_type_t;
+typedef enum _osm_mcast_req_type {
+	OSM_MCAST_REQ_TYPE_CREATE,
+	OSM_MCAST_REQ_TYPE_JOIN,
+	OSM_MCAST_REQ_TYPE_LEAVE,
+	OSM_MCAST_REQ_TYPE_SUBNET_CHANGE
+} osm_mcast_req_type_t;
 /***********/
 
 /****s* OpenSM: Base/MAX_GUID_FILE_LINE_LENGTH
@@ -862,5 +815,4 @@ typedef enum _osm_mcast_req_type
 /**********/
 
 END_C_DECLS
-
-#endif	/* _OSM_BASE_H_ */
+#endif				/* _OSM_BASE_H_ */
diff --git a/opensm/include/opensm/osm_console.h b/opensm/include/opensm/osm_console.h
index 977a8d6..ceba3cc 100644
--- a/opensm/include/opensm/osm_console.h
+++ b/opensm/include/opensm/osm_console.h
@@ -47,18 +47,16 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
-void osm_console_init(osm_subn_opt_t *opt, osm_opensm_t *p_osm);
-void osm_console(osm_opensm_t *p_osm);
-void osm_console_prompt(FILE *out);
-void osm_console_close_socket(osm_opensm_t *p_osm);
+void osm_console_init(osm_subn_opt_t * opt, osm_opensm_t * p_osm);
+void osm_console(osm_opensm_t * p_osm);
+void osm_console_prompt(FILE * out);
+void osm_console_close_socket(osm_opensm_t * p_osm);
 
 END_C_DECLS
-
-#endif	/* _OSM_CONSOLE_H_ */
+#endif				/* _OSM_CONSOLE_H_ */
diff --git a/opensm/include/opensm/osm_db.h b/opensm/include/opensm/osm_db.h
index dbb5d74..eb05f45 100644
--- a/opensm/include/opensm/osm_db.h
+++ b/opensm/include/opensm/osm_db.h
@@ -50,13 +50,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/Database
 * NAME
 *	Database
@@ -79,7 +78,6 @@ BEGIN_C_DECLS
 *	Eitan Zahavi, Mellanox Technologies LTD
 *
 *********/
-
 /****s* OpenSM: Database/osm_db_domain_t
 * NAME
 *	osm_db_domain_t
@@ -93,8 +91,8 @@ BEGIN_C_DECLS
 * SYNOPSIS
 */
 typedef struct _osm_db_domain {
-  struct _osm_db     *p_db;
-  void               *p_domain_imp;
+	struct _osm_db *p_db;
+	void *p_domain_imp;
 } osm_db_domain_t;
 /*
 * FIELDS
@@ -120,11 +118,10 @@ typedef struct _osm_db_domain {
 *
 * SYNOPSIS
 */
-typedef struct _osm_db
-{
-  void        *p_db_imp;
-  osm_log_t   *p_log;
-  cl_list_t    domains;
+typedef struct _osm_db {
+	void *p_db_imp;
+	osm_log_t *p_log;
+	cl_list_t domains;
 } osm_db_t;
 /*
 * FIELDS
@@ -149,9 +146,7 @@ typedef struct _osm_db
 *
 * SYNOPSIS
 */
-void
-osm_db_construct(
-   IN osm_db_t* const p_db );
+void osm_db_construct(IN osm_db_t * const p_db);
 /*
 * PARAMETERS
 *	p_db
@@ -173,9 +168,7 @@ osm_db_construct(
 *
 * SYNOPSIS
 */
-void
-osm_db_destroy(
-	IN osm_db_t* const p_db );
+void osm_db_destroy(IN osm_db_t * const p_db);
 /*
 * PARAMETERS
 *	p_db
@@ -194,10 +187,7 @@ osm_db_destroy(
 *
 * SYNOPSIS
 */
-int
-osm_db_init(
-	IN osm_db_t* const p_db,
-	IN osm_log_t *p_log  );
+int osm_db_init(IN osm_db_t * const p_db, IN osm_log_t * p_log);
 /*
 * PARAMETERS
 *
@@ -223,10 +213,8 @@ osm_db_init(
 *
 * SYNOPSIS
 */
-osm_db_domain_t*
-osm_db_domain_init(
-   IN osm_db_t* const p_db,
-   IN char *domain_name);
+osm_db_domain_t *osm_db_domain_init(IN osm_db_t * const p_db,
+				    IN char *domain_name);
 /*
 * PARAMETERS
 *
@@ -253,9 +241,7 @@ osm_db_domain_init(
 *
 * SYNOPSIS
 */
-int
-osm_db_restore(
-  IN osm_db_domain_t *p_domain);
+int osm_db_restore(IN osm_db_domain_t * p_domain);
 /*
 * PARAMETERS
 *
@@ -279,9 +265,7 @@ osm_db_restore(
 *
 * SYNOPSIS
 */
-int
-osm_db_clear(
-  IN osm_db_domain_t *p_domain);
+int osm_db_clear(IN osm_db_domain_t * p_domain);
 /*
 * PARAMETERS
 *
@@ -305,8 +289,7 @@ osm_db_clear(
 *
 * SYNOPSIS
 */
-int osm_db_store(
-   IN osm_db_domain_t *p_domain);
+int osm_db_store(IN osm_db_domain_t * p_domain);
 /*
 * PARAMETERS
 *
@@ -330,10 +313,7 @@ int osm_db_store(
 *
 * SYNOPSIS
 */
-int
-osm_db_keys(
-  IN osm_db_domain_t *p_domain,
-  OUT cl_list_t* p_key_list);
+int osm_db_keys(IN osm_db_domain_t * p_domain, OUT cl_list_t * p_key_list);
 /*
 * PARAMETERS
 *
@@ -364,9 +344,7 @@ osm_db_keys(
 * SYNOPSIS
 */
 /* lookup value by key */
-char *osm_db_lookup(
-   IN osm_db_domain_t *p_domain,
-   IN char *const p_key);
+char *osm_db_lookup(IN osm_db_domain_t * p_domain, IN char *const p_key);
 /*
 * PARAMETERS
 *
@@ -394,10 +372,8 @@ char *osm_db_lookup(
 * SYNOPSIS
 */
 int
-osm_db_update(
-  IN osm_db_domain_t *p_domain,
-  IN char *const p_key,
-  IN char *const p_val);
+osm_db_update(IN osm_db_domain_t * p_domain,
+	      IN char *const p_key, IN char *const p_val);
 /*
 * PARAMETERS
 *
@@ -429,10 +405,7 @@ osm_db_update(
 *
 * SYNOPSIS
 */
-int
-osm_db_delete(
-  IN osm_db_domain_t *p_domain,
-  IN char *const p_key);
+int osm_db_delete(IN osm_db_domain_t * p_domain, IN char *const p_key);
 /*
 * PARAMETERS
 *
@@ -451,5 +424,4 @@ osm_db_delete(
 *********/
 
 END_C_DECLS
-
-#endif		/* _OSM_DB_H_ */
+#endif				/* _OSM_DB_H_ */
diff --git a/opensm/include/opensm/osm_db_pack.h b/opensm/include/opensm/osm_db_pack.h
index 8e18920..45838da 100644
--- a/opensm/include/opensm/osm_db_pack.h
+++ b/opensm/include/opensm/osm_db_pack.h
@@ -57,13 +57,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****f* OpenSM: DB-Pack/osm_db_guid2lid_init
 * NAME
 *	osm_db_guid2lid_init
@@ -73,12 +72,11 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-static inline osm_db_domain_t*
-osm_db_guid2lid_init(
-  IN osm_db_t* const p_db )
+static inline osm_db_domain_t *osm_db_guid2lid_init(IN osm_db_t * const p_db)
 {
-  return( osm_db_domain_init( p_db, "guid2lid" ) );
+	return (osm_db_domain_init(p_db, "guid2lid"));
 }
+
 /*
 * PARAMETERS
 *	p_db
@@ -103,8 +101,8 @@ osm_db_guid2lid_init(
 * SYNOPSIS
 */
 typedef struct _osm_db_guid_elem {
-  cl_list_item_t item;
-  uint64_t       guid;
+	cl_list_item_t item;
+	uint64_t guid;
 } osm_db_guid_elem_t;
 /*
 * FIELDS
@@ -125,9 +123,8 @@ typedef struct _osm_db_guid_elem {
 * SYNOPSIS
 */
 int
-osm_db_guid2lid_guids(
-  IN osm_db_domain_t* const p_g2l,
-  OUT cl_qlist_t* p_guid_list );
+osm_db_guid2lid_guids(IN osm_db_domain_t * const p_g2l,
+		      OUT cl_qlist_t * p_guid_list);
 /*
 * PARAMETERS
 *	p_g2l
@@ -157,11 +154,9 @@ osm_db_guid2lid_guids(
 * SYNOPSIS
 */
 int
-osm_db_guid2lid_get(
-  IN osm_db_domain_t* const p_g2l,
-  IN uint64_t guid,
-  OUT uint16_t *p_min_lid,
-  OUT uint16_t *p_max_lid);
+osm_db_guid2lid_get(IN osm_db_domain_t * const p_g2l,
+		    IN uint64_t guid,
+		    OUT uint16_t * p_min_lid, OUT uint16_t * p_max_lid);
 /*
 * PARAMETERS
 *	p_g2l
@@ -194,11 +189,8 @@ osm_db_guid2lid_get(
 * SYNOPSIS
 */
 int
-osm_db_guid2lid_set(
-  IN osm_db_domain_t* const p_g2l,
-  IN uint64_t guid,
-  IN uint16_t min_lid,
-  IN uint16_t max_lid);
+osm_db_guid2lid_set(IN osm_db_domain_t * const p_g2l,
+		    IN uint64_t guid, IN uint16_t min_lid, IN uint16_t max_lid);
 /*
 * PARAMETERS
 *	p_g2l
@@ -230,10 +222,7 @@ osm_db_guid2lid_set(
 *
 * SYNOPSIS
 */
-int
-osm_db_guid2lid_delete(
-  IN osm_db_domain_t* const p_g2l,
-  IN uint64_t guid );
+int osm_db_guid2lid_delete(IN osm_db_domain_t * const p_g2l, IN uint64_t guid);
 /*
 * PARAMETERS
 *	p_g2l
@@ -251,5 +240,4 @@ osm_db_guid2lid_delete(
 *********/
 
 END_C_DECLS
-
-#endif /* _OSM_DB_PACK_H_ */
+#endif				/* _OSM_DB_PACK_H_ */
diff --git a/opensm/include/opensm/osm_drop_mgr.h b/opensm/include/opensm/osm_drop_mgr.h
index 91d6571..0f929e0 100644
--- a/opensm/include/opensm/osm_drop_mgr.h
+++ b/opensm/include/opensm/osm_drop_mgr.h
@@ -58,13 +58,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/Drop Manager
 * NAME
 *	Drop Manager
@@ -82,7 +81,6 @@ BEGIN_C_DECLS
 *	Steve King, Intel
 *
 *********/
-
 /****s* OpenSM: Drop Manager/osm_drop_mgr_t
 * NAME
 *	osm_drop_mgr_t
@@ -95,12 +93,11 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_drop_mgr
-{
-	osm_subn_t					*p_subn;
-	osm_log_t					*p_log;
-	osm_req_t					*p_req;
-	cl_plock_t					*p_lock;
+typedef struct _osm_drop_mgr {
+	osm_subn_t *p_subn;
+	osm_log_t *p_log;
+	osm_req_t *p_req;
+	cl_plock_t *p_lock;
 
 } osm_drop_mgr_t;
 /*
@@ -130,8 +127,7 @@ typedef struct _osm_drop_mgr
 *
 * SYNOPSIS
 */
-void osm_drop_mgr_construct(
-	IN osm_drop_mgr_t* const p_mgr );
+void osm_drop_mgr_construct(IN osm_drop_mgr_t * const p_mgr);
 /*
 * PARAMETERS
 *	p_mgr
@@ -161,8 +157,7 @@ void osm_drop_mgr_construct(
 *
 * SYNOPSIS
 */
-void osm_drop_mgr_destroy(
-	IN osm_drop_mgr_t* const p_mgr );
+void osm_drop_mgr_destroy(IN osm_drop_mgr_t * const p_mgr);
 /*
 * PARAMETERS
 *	p_mgr
@@ -193,12 +188,11 @@ void osm_drop_mgr_destroy(
 *
 * SYNOPSIS
 */
-ib_api_status_t osm_drop_mgr_init(
-	IN osm_drop_mgr_t* const p_mgr,
-	IN osm_subn_t* const p_subn,
-	IN osm_log_t* const p_log,
-	IN osm_req_t* const p_req,
-	IN cl_plock_t* const p_lock );
+ib_api_status_t osm_drop_mgr_init(IN osm_drop_mgr_t * const p_mgr,
+				  IN osm_subn_t * const p_subn,
+				  IN osm_log_t * const p_log,
+				  IN osm_req_t * const p_req,
+				  IN cl_plock_t * const p_lock);
 /*
 * PARAMETERS
 *	p_mgr
@@ -237,8 +231,7 @@ ib_api_status_t osm_drop_mgr_init(
 *
 * SYNOPSIS
 */
-void osm_drop_mgr_process(
-	IN const osm_drop_mgr_t* const p_mgr );
+void osm_drop_mgr_process(IN const osm_drop_mgr_t * const p_mgr);
 /*
 * PARAMETERS
 *	p_mgr
@@ -255,5 +248,4 @@ void osm_drop_mgr_process(
 *********/
 
 END_C_DECLS
-
-#endif	/* _OSM_DROP_MGR_H_ */
+#endif				/* _OSM_DROP_MGR_H_ */
diff --git a/opensm/include/opensm/osm_errors.h b/opensm/include/opensm/osm_errors.h
index 03f3dea..2c7a9ba 100644
--- a/opensm/include/opensm/osm_errors.h
+++ b/opensm/include/opensm/osm_errors.h
@@ -178,4 +178,4 @@
 
 */
 
-#endif /* _OSM_ERRORS_H_ */
+#endif				/* _OSM_ERRORS_H_ */
diff --git a/opensm/include/opensm/osm_event_plugin.h b/opensm/include/opensm/osm_event_plugin.h
index b575d2a..099dc14 100644
--- a/opensm/include/opensm/osm_event_plugin.h
+++ b/opensm/include/opensm/osm_event_plugin.h
@@ -41,13 +41,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM Event plugin interface
 * DESCRIPTION
 *       Database interface to record subnet events
@@ -58,15 +57,12 @@ BEGIN_C_DECLS
 *	Ira Weiny, LLNL
 *
 *********/
-
 #define OSM_EVENT_PLUGIN_NAME_NONE "NONE"
-
 #ifdef ENABLE_OSM_DEFAULT_EVENT_PLUGIN
 #define OSM_DEFAULT_EVENT_PLUGIN_NAME "osmeventplugin"
-#else /* !ENABLE_OSM_DEFAULT_EVENT_PLUGIN */
+#else				/* !ENABLE_OSM_DEFAULT_EVENT_PLUGIN */
 #define OSM_DEFAULT_EVENT_PLUGIN_NAME OSM_EVENT_PLUGIN_NAME_NONE
-#endif /* ENABLE_OSM_DEFAULT_EVENT_PLUGIN */
-
+#endif				/* ENABLE_OSM_DEFAULT_EVENT_PLUGIN */
 #define OSM_EPI_NODE_NAME_LEN (128)
 /** =========================================================================
  * Event types
@@ -80,9 +76,9 @@ typedef enum {
 } osm_epi_event_id_t;
 
 typedef struct {
-	uint64_t   node_guid;
-	uint8_t    port_num;
-	char       node_name[OSM_EPI_NODE_NAME_LEN];
+	uint64_t node_guid;
+	uint8_t port_num;
+	char node_name[OSM_EPI_NODE_NAME_LEN];
 } osm_epi_port_id_t;
 
 /** =========================================================================
@@ -92,19 +88,19 @@ typedef struct {
  */
 typedef struct {
 	osm_epi_port_id_t port_id;
-	uint64_t          symbol_err_cnt;
-	uint64_t          link_err_recover;
-	uint64_t          link_downed;
-	uint64_t          rcv_err;
-	uint64_t          rcv_rem_phys_err;
-	uint64_t          rcv_switch_relay_err;
-	uint64_t          xmit_discards;
-	uint64_t          xmit_constraint_err;
-	uint64_t          rcv_constraint_err;
-	uint64_t          link_integrity;
-	uint64_t          buffer_overrun;
-	uint64_t          vl15_dropped;
-	time_t            time_diff_s;
+	uint64_t symbol_err_cnt;
+	uint64_t link_err_recover;
+	uint64_t link_downed;
+	uint64_t rcv_err;
+	uint64_t rcv_rem_phys_err;
+	uint64_t rcv_switch_relay_err;
+	uint64_t xmit_discards;
+	uint64_t xmit_constraint_err;
+	uint64_t rcv_constraint_err;
+	uint64_t link_integrity;
+	uint64_t buffer_overrun;
+	uint64_t vl15_dropped;
+	time_t time_diff_s;
 } osm_epi_pe_event_t;
 
 /** =========================================================================
@@ -113,15 +109,15 @@ typedef struct {
  */
 typedef struct {
 	osm_epi_port_id_t port_id;
-	uint64_t          xmit_data;
-	uint64_t          rcv_data;
-	uint64_t          xmit_pkts;
-	uint64_t          rcv_pkts;
-	uint64_t          unicast_xmit_pkts;
-	uint64_t          unicast_rcv_pkts;
-	uint64_t          multicast_xmit_pkts;
-	uint64_t          multicast_rcv_pkts;
-	time_t            time_diff_s;
+	uint64_t xmit_data;
+	uint64_t rcv_data;
+	uint64_t xmit_pkts;
+	uint64_t rcv_pkts;
+	uint64_t unicast_xmit_pkts;
+	uint64_t unicast_rcv_pkts;
+	uint64_t multicast_xmit_pkts;
+	uint64_t multicast_rcv_pkts;
+	time_t time_diff_s;
 } osm_epi_dc_event_t;
 
 /** =========================================================================
@@ -130,8 +126,8 @@ typedef struct {
  */
 typedef struct {
 	osm_epi_port_id_t port_id;
-	uint64_t          xmit_wait;
-	time_t            time_diff_s;
+	uint64_t xmit_wait;
+	time_t time_diff_s;
 } osm_epi_ps_event_t;
 
 /** =========================================================================
@@ -139,11 +135,11 @@ typedef struct {
  */
 typedef struct {
 	osm_epi_port_id_t port_id;
-	uint8_t           type;
-	uint32_t          prod_type;
-	uint16_t          trap_num;
-	uint16_t          issuer_lid;
-	time_t            time;
+	uint8_t type;
+	uint32_t prod_type;
+	uint16_t trap_num;
+	uint16_t issuer_lid;
+	time_t time;
 } osm_epi_trap_event_t;
 
 /** =========================================================================
@@ -153,15 +149,13 @@ typedef struct {
  */
 #define OSM_EVENT_PLUGIN_IMPL_NAME "osm_event_plugin"
 #define OSM_EVENT_PLUGIN_INTERFACE_VER (1)
-typedef struct
-{
-	int   interface_version;
-	void *(*construct)(osm_log_t *osm_log);
-	void  (*destroy)(void *plugin_data);
+typedef struct {
+	int interface_version;
+	void *(*construct) (osm_log_t * osm_log);
+	void (*destroy) (void *plugin_data);
 
-	void  (*report)(void *plugin_data,
-			osm_epi_event_id_t event_id,
-			void *event_data);
+	void (*report) (void *plugin_data,
+			osm_epi_event_id_t event_id, void *event_data);
 
 } __osm_epi_plugin_t;
 
@@ -169,36 +163,32 @@ typedef struct
  * The database structure should be considered opaque
  */
 typedef struct {
-	void                *handle;
-	__osm_epi_plugin_t  *impl;
-	void                *plugin_data;
-	osm_log_t           *p_log;
+	void *handle;
+	__osm_epi_plugin_t *impl;
+	void *plugin_data;
+	osm_log_t *p_log;
 } osm_epi_plugin_t;
 
-
 /**
  * functions
  */
-osm_epi_plugin_t *osm_epi_construct(osm_log_t *p_log, char *plugin_name);
-void              osm_epi_destroy(osm_epi_plugin_t *plugin);
-void              osm_epi_report(osm_epi_plugin_t *plugin,
-				osm_epi_event_id_t event_id,
-				void *event_data);
+osm_epi_plugin_t *osm_epi_construct(osm_log_t * p_log, char *plugin_name);
+void osm_epi_destroy(osm_epi_plugin_t * plugin);
+void osm_epi_report(osm_epi_plugin_t * plugin,
+		    osm_epi_event_id_t event_id, void *event_data);
 
 /** =========================================================================
  * Helper functions
  */
 static inline void
-osm_epi_create_port_id(osm_epi_port_id_t *port_id, uint64_t node_guid,
-			uint8_t port_num, char *node_name)
+osm_epi_create_port_id(osm_epi_port_id_t * port_id, uint64_t node_guid,
+		       uint8_t port_num, char *node_name)
 {
 	port_id->node_guid = node_guid;
 	port_id->port_num = port_num;
 	strncpy(port_id->node_name, node_name, OSM_EPI_NODE_NAME_LEN);
-	port_id->node_name[OSM_EPI_NODE_NAME_LEN-1] = '\0';
+	port_id->node_name[OSM_EPI_NODE_NAME_LEN - 1] = '\0';
 }
 
 END_C_DECLS
-
-#endif		/* _OSM_EVENT_PLUGIN_H_ */
-
+#endif				/* _OSM_EVENT_PLUGIN_H_ */
diff --git a/opensm/include/opensm/osm_fwd_tbl.h b/opensm/include/opensm/osm_fwd_tbl.h
index 65eacb3..789d633 100644
--- a/opensm/include/opensm/osm_fwd_tbl.h
+++ b/opensm/include/opensm/osm_fwd_tbl.h
@@ -56,13 +56,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/Forwarding Table
 * NAME
 *	Forwarding Table
@@ -80,7 +79,6 @@ BEGIN_C_DECLS
 *	Steve King, Intel
 *
 *********/
-
 /****s* OpenSM: Forwarding Table/osm_fwd_tbl_t
 * NAME
 *	osm_fwd_tbl_t
@@ -95,10 +93,9 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_fwd_tbl_t
-{
-	osm_rand_fwd_tbl_t	*p_rnd_tbl;
-	osm_lin_fwd_tbl_t	*p_lin_tbl;
+typedef struct _osm_fwd_tbl_t {
+	osm_rand_fwd_tbl_t *p_rnd_tbl;
+	osm_lin_fwd_tbl_t *p_lin_tbl;
 
 } osm_fwd_tbl_t;
 /*
@@ -127,9 +124,8 @@ typedef struct _osm_fwd_tbl_t
 * SYNOPSIS
 */
 ib_api_status_t
-osm_fwd_tbl_init(
-	IN osm_fwd_tbl_t* const p_tbl,
-	IN const ib_switch_info_t* const p_si );
+osm_fwd_tbl_init(IN osm_fwd_tbl_t * const p_tbl,
+		 IN const ib_switch_info_t * const p_si);
 /*
 * PARAMETERS
 *	p_tbl
@@ -156,9 +152,7 @@ osm_fwd_tbl_init(
 *
 * SYNOPSIS
 */
-void
-osm_fwd_tbl_destroy(
-	IN osm_fwd_tbl_t* const p_tbl );
+void osm_fwd_tbl_destroy(IN osm_fwd_tbl_t * const p_tbl);
 /*
 * PARAMETERS
 *	p_tbl
@@ -182,15 +176,14 @@ osm_fwd_tbl_destroy(
 * SYNOPSIS
 */
 static inline uint8_t
-osm_fwd_tbl_get(
-	IN const osm_fwd_tbl_t* const p_tbl,
-	IN uint16_t const lid_ho )
+osm_fwd_tbl_get(IN const osm_fwd_tbl_t * const p_tbl, IN uint16_t const lid_ho)
 {
-	if( p_tbl->p_lin_tbl )
-		return( osm_lin_fwd_tbl_get( p_tbl->p_lin_tbl, lid_ho ) );
+	if (p_tbl->p_lin_tbl)
+		return (osm_lin_fwd_tbl_get(p_tbl->p_lin_tbl, lid_ho));
 	else
-		return( osm_rand_fwd_tbl_get( p_tbl->p_rnd_tbl, lid_ho ) );
+		return (osm_rand_fwd_tbl_get(p_tbl->p_rnd_tbl, lid_ho));
 }
+
 /*
 * PARAMETERS
 *	p_tbl
@@ -218,17 +211,16 @@ osm_fwd_tbl_get(
 * SYNOPSIS
 */
 static inline void
-osm_fwd_tbl_set(
-	IN osm_fwd_tbl_t* const p_tbl,
-	IN const uint16_t lid_ho,
-	IN const uint8_t port )
+osm_fwd_tbl_set(IN osm_fwd_tbl_t * const p_tbl,
+		IN const uint16_t lid_ho, IN const uint8_t port)
 {
-	CL_ASSERT( p_tbl );
-	if( p_tbl->p_lin_tbl )
-		osm_lin_fwd_tbl_set( p_tbl->p_lin_tbl, lid_ho, port );
+	CL_ASSERT(p_tbl);
+	if (p_tbl->p_lin_tbl)
+		osm_lin_fwd_tbl_set(p_tbl->p_lin_tbl, lid_ho, port);
 	else
-		osm_rand_fwd_tbl_set( p_tbl->p_rnd_tbl, lid_ho, port );
+		osm_rand_fwd_tbl_set(p_tbl->p_rnd_tbl, lid_ho, port);
 }
+
 /*
 * PARAMETERS
 *	p_tbl
@@ -258,19 +250,19 @@ osm_fwd_tbl_set(
 * SYNOPSIS
 */
 static inline ib_api_status_t
-osm_fwd_tbl_set_block(
-	IN osm_fwd_tbl_t* const p_tbl,
-	IN const uint8_t* const p_block,
-	IN const uint32_t block_num )
+osm_fwd_tbl_set_block(IN osm_fwd_tbl_t * const p_tbl,
+		      IN const uint8_t * const p_block,
+		      IN const uint32_t block_num)
 {
-	CL_ASSERT( p_tbl );
-	if( p_tbl->p_lin_tbl )
-		return( osm_lin_fwd_tbl_set_block( p_tbl->p_lin_tbl,
-				p_block, block_num ) );
+	CL_ASSERT(p_tbl);
+	if (p_tbl->p_lin_tbl)
+		return (osm_lin_fwd_tbl_set_block(p_tbl->p_lin_tbl,
+						  p_block, block_num));
 	else
-		return( osm_rand_fwd_tbl_set_block( p_tbl->p_rnd_tbl,
-				p_block, block_num ) );
+		return (osm_rand_fwd_tbl_set_block(p_tbl->p_rnd_tbl,
+						   p_block, block_num));
 }
+
 /*
 * PARAMETERS
 *	p_tbl
@@ -294,15 +286,15 @@ osm_fwd_tbl_set_block(
 * SYNOPSIS
 */
 static inline uint16_t
-osm_fwd_tbl_get_size(
-	IN const osm_fwd_tbl_t* const p_tbl )
+osm_fwd_tbl_get_size(IN const osm_fwd_tbl_t * const p_tbl)
 {
-	CL_ASSERT( p_tbl );
-	if( p_tbl->p_lin_tbl )
-		return( osm_lin_fwd_tbl_get_size( p_tbl->p_lin_tbl ) );
+	CL_ASSERT(p_tbl);
+	if (p_tbl->p_lin_tbl)
+		return (osm_lin_fwd_tbl_get_size(p_tbl->p_lin_tbl));
 	else
-		return( osm_rand_fwd_tbl_get_size( p_tbl->p_rnd_tbl ) );
+		return (osm_rand_fwd_tbl_get_size(p_tbl->p_rnd_tbl));
 }
+
 /*
 * PARAMETERS
 *	p_tbl
@@ -326,15 +318,15 @@ osm_fwd_tbl_get_size(
 * SYNOPSIS
 */
 static inline uint16_t
-osm_fwd_tbl_get_lids_per_block(
-	IN const osm_fwd_tbl_t* const p_tbl )
+osm_fwd_tbl_get_lids_per_block(IN const osm_fwd_tbl_t * const p_tbl)
 {
-	CL_ASSERT( p_tbl );
-	if( p_tbl->p_lin_tbl )
-		return( osm_lin_fwd_tbl_get_lids_per_block( p_tbl->p_lin_tbl ) );
+	CL_ASSERT(p_tbl);
+	if (p_tbl->p_lin_tbl)
+		return (osm_lin_fwd_tbl_get_lids_per_block(p_tbl->p_lin_tbl));
 	else
-		return( osm_rand_fwd_tbl_get_lids_per_block( p_tbl->p_rnd_tbl ) );
+		return (osm_rand_fwd_tbl_get_lids_per_block(p_tbl->p_rnd_tbl));
 }
+
 /*
 * PARAMETERS
 *	p_tbl
@@ -358,18 +350,18 @@ osm_fwd_tbl_get_lids_per_block(
 * SYNOPSIS
 */
 static inline uint16_t
-osm_fwd_tbl_get_max_block_id_in_use(
-	IN const osm_fwd_tbl_t* const p_tbl,
-	IN const uint16_t lid_top_ho )
+osm_fwd_tbl_get_max_block_id_in_use(IN const osm_fwd_tbl_t * const p_tbl,
+				    IN const uint16_t lid_top_ho)
 {
-	CL_ASSERT( p_tbl );
-	if( p_tbl->p_lin_tbl )
-		return( osm_lin_fwd_tbl_get_max_block_id_in_use(
-				p_tbl->p_lin_tbl, lid_top_ho ) );
+	CL_ASSERT(p_tbl);
+	if (p_tbl->p_lin_tbl)
+		return (osm_lin_fwd_tbl_get_max_block_id_in_use
+			(p_tbl->p_lin_tbl, lid_top_ho));
 	else
-		return( osm_rand_fwd_tbl_get_max_block_id_in_use(
-				p_tbl->p_rnd_tbl, lid_top_ho ) );
+		return (osm_rand_fwd_tbl_get_max_block_id_in_use
+			(p_tbl->p_rnd_tbl, lid_top_ho));
 }
+
 /*
 * PARAMETERS
 *	p_tbl
@@ -384,5 +376,4 @@ osm_fwd_tbl_get_max_block_id_in_use(
 *********/
 
 END_C_DECLS
-
-#endif		/* _OSM_FWD_TBL_H_ */
+#endif				/* _OSM_FWD_TBL_H_ */
diff --git a/opensm/include/opensm/osm_helper.h b/opensm/include/opensm/osm_helper.h
index 91f9eeb..5cbb8f0 100644
--- a/opensm/include/opensm/osm_helper.h
+++ b/opensm/include/opensm/osm_helper.h
@@ -46,13 +46,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /*
  * Abstract:
  * 	Declaration of helpful functions.
@@ -62,7 +61,6 @@ BEGIN_C_DECLS
  *
  * $Revision: 1.7 $
  */
-
 /****f* OpenSM: Helper/ib_get_sa_method_str
  * NAME
  *	ib_get_sa_method_str
@@ -72,9 +70,7 @@ BEGIN_C_DECLS
  *
  * SYNOPSIS
  */
-const char*
-ib_get_sa_method_str(
-  IN uint8_t method );
+const char *ib_get_sa_method_str(IN uint8_t method);
 /*
  * PARAMETERS
  *	method
@@ -97,9 +93,7 @@ ib_get_sa_method_str(
 *
 * SYNOPSIS
 */
-const char*
-ib_get_sm_method_str(
-	IN uint8_t method );
+const char *ib_get_sm_method_str(IN uint8_t method);
 /*
 * PARAMETERS
 *	method
@@ -122,9 +116,7 @@ ib_get_sm_method_str(
 *
 * SYNOPSIS
 */
-const char*
-ib_get_sm_attr_str(
-	IN ib_net16_t attr );
+const char *ib_get_sm_attr_str(IN ib_net16_t attr);
 /*
 * PARAMETERS
 *	attr
@@ -147,9 +139,7 @@ ib_get_sm_attr_str(
 *
 * SYNOPSIS
 */
-const char*
-ib_get_sa_attr_str(
-	IN ib_net16_t attr );
+const char *ib_get_sa_attr_str(IN ib_net16_t attr);
 /*
 * PARAMETERS
 *	attr
@@ -172,13 +162,12 @@ ib_get_sa_attr_str(
 *
 * SYNOPSIS
 */
-void osm_dump_port_info(
-	IN osm_log_t* const p_log,
-	IN const ib_net64_t node_guid,
-	IN const ib_net64_t port_guid,
-	IN const uint8_t port_num,
-	IN const ib_port_info_t* const p_pi,
-	IN const osm_log_level_t log_level );
+void osm_dump_port_info(IN osm_log_t * const p_log,
+			IN const ib_net64_t node_guid,
+			IN const ib_net64_t port_guid,
+			IN const uint8_t port_num,
+			IN const ib_port_info_t * const p_pi,
+			IN const osm_log_level_t log_level);
 /*
 * PARAMETERS
 *	p_log
@@ -208,103 +197,88 @@ void osm_dump_port_info(
 *********/
 
 void
-osm_dump_path_record(
-	IN osm_log_t* const p_log,
-	IN const ib_path_rec_t* const p_pr,
-	IN const osm_log_level_t log_level );
+osm_dump_path_record(IN osm_log_t * const p_log,
+		     IN const ib_path_rec_t * const p_pr,
+		     IN const osm_log_level_t log_level);
 
 void
-osm_dump_multipath_record(
-	IN osm_log_t* const p_log,
-	IN const ib_multipath_rec_t* const p_mpr,
-	IN const osm_log_level_t log_level );
+osm_dump_multipath_record(IN osm_log_t * const p_log,
+			  IN const ib_multipath_rec_t * const p_mpr,
+			  IN const osm_log_level_t log_level);
 
 void
-osm_dump_node_record(
-	IN osm_log_t* const p_log,
-	IN const ib_node_record_t* const p_nr,
-	IN const osm_log_level_t log_level );
+osm_dump_node_record(IN osm_log_t * const p_log,
+		     IN const ib_node_record_t * const p_nr,
+		     IN const osm_log_level_t log_level);
 
 void
-osm_dump_mc_record(
-	IN osm_log_t* const p_log,
-	IN const ib_member_rec_t* const p_mcmr,
-	IN const osm_log_level_t log_level );
+osm_dump_mc_record(IN osm_log_t * const p_log,
+		   IN const ib_member_rec_t * const p_mcmr,
+		   IN const osm_log_level_t log_level);
 
 void
-osm_dump_link_record(
-	IN osm_log_t*			const p_log,
-	IN const ib_link_record_t*	const p_lr,
-	IN const osm_log_level_t	log_level );
+osm_dump_link_record(IN osm_log_t * const p_log,
+		     IN const ib_link_record_t * const p_lr,
+		     IN const osm_log_level_t log_level);
 
 void
-osm_dump_service_record(
-	IN osm_log_t* const p_log,
-	IN const ib_service_record_t* const p_sr,
-	IN const osm_log_level_t log_level );
+osm_dump_service_record(IN osm_log_t * const p_log,
+			IN const ib_service_record_t * const p_sr,
+			IN const osm_log_level_t log_level);
 
 void
-osm_dump_portinfo_record(
-	IN osm_log_t* const p_log,
-	IN const ib_portinfo_record_t* const p_pir,
-	IN const osm_log_level_t log_level );
+osm_dump_portinfo_record(IN osm_log_t * const p_log,
+			 IN const ib_portinfo_record_t * const p_pir,
+			 IN const osm_log_level_t log_level);
 
 void
-osm_dump_guidinfo_record(
-	IN osm_log_t* const p_log,
-	IN const ib_guidinfo_record_t* const p_gir,
-	IN const osm_log_level_t log_level );
+osm_dump_guidinfo_record(IN osm_log_t * const p_log,
+			 IN const ib_guidinfo_record_t * const p_gir,
+			 IN const osm_log_level_t log_level);
 
 void
-osm_dump_inform_info(
-	IN osm_log_t* const p_log,
-	IN const ib_inform_info_t* const p_ii,
-	IN const osm_log_level_t log_level );
+osm_dump_inform_info(IN osm_log_t * const p_log,
+		     IN const ib_inform_info_t * const p_ii,
+		     IN const osm_log_level_t log_level);
 
 void
-osm_dump_inform_info_record(
-	IN osm_log_t* const p_log,
-	IN const ib_inform_info_record_t* const p_iir,
-	IN const osm_log_level_t log_level );
+osm_dump_inform_info_record(IN osm_log_t * const p_log,
+			    IN const ib_inform_info_record_t * const p_iir,
+			    IN const osm_log_level_t log_level);
 
 void
-osm_dump_switch_info_record(
-	IN osm_log_t* const p_log,
-	IN const ib_switch_info_record_t* const p_sir,
-	IN const osm_log_level_t log_level );
+osm_dump_switch_info_record(IN osm_log_t * const p_log,
+			    IN const ib_switch_info_record_t * const p_sir,
+			    IN const osm_log_level_t log_level);
 
 void
-osm_dump_sm_info_record(
-	IN osm_log_t* const p_log,
-	IN const ib_sminfo_record_t* const p_smir,
-	IN const osm_log_level_t log_level );
+osm_dump_sm_info_record(IN osm_log_t * const p_log,
+			IN const ib_sminfo_record_t * const p_smir,
+			IN const osm_log_level_t log_level);
 
 void
-osm_dump_pkey_block(
-	IN osm_log_t* const p_log,
-	IN uint64_t port_guid,
-	IN uint16_t block_num,
-	IN uint8_t port_num,
-	IN const ib_pkey_table_t* const p_pkey_tbl,
-	IN const osm_log_level_t log_level );
+osm_dump_pkey_block(IN osm_log_t * const p_log,
+		    IN uint64_t port_guid,
+		    IN uint16_t block_num,
+		    IN uint8_t port_num,
+		    IN const ib_pkey_table_t * const p_pkey_tbl,
+		    IN const osm_log_level_t log_level);
 
 void
-osm_dump_slvl_map_table(
-	IN osm_log_t* const p_log,
-	IN uint64_t port_guid,
-	IN uint8_t in_port_num,
-	IN uint8_t out_port_num,
-	IN const ib_slvl_table_t* const p_slvl_tbl,
-	IN const osm_log_level_t log_level );
+osm_dump_slvl_map_table(IN osm_log_t * const p_log,
+			IN uint64_t port_guid,
+			IN uint8_t in_port_num,
+			IN uint8_t out_port_num,
+			IN const ib_slvl_table_t * const p_slvl_tbl,
+			IN const osm_log_level_t log_level);
 
 void
-osm_dump_vl_arb_table(
-	IN osm_log_t* const p_log,
-	IN uint64_t port_guid,
-	IN uint8_t block_num,
-	IN uint8_t port_num,
-	IN const ib_vl_arb_table_t* const p_vla_tbl,
-	IN const osm_log_level_t log_level );
+osm_dump_vl_arb_table(IN osm_log_t * const p_log,
+		      IN uint64_t port_guid,
+		      IN uint8_t block_num,
+		      IN uint8_t port_num,
+		      IN const ib_vl_arb_table_t * const p_vla_tbl,
+		      IN const osm_log_level_t log_level);
 
 /****f* OpenSM: Helper/osm_dump_port_info
 * NAME
@@ -315,10 +289,9 @@ osm_dump_vl_arb_table(
 *
 * SYNOPSIS
 */
-void osm_dump_node_info(
-	IN osm_log_t* const p_log,
-	IN const ib_node_info_t* const p_ni,
-	IN const osm_log_level_t log_level );
+void osm_dump_node_info(IN osm_log_t * const p_log,
+			IN const ib_node_info_t * const p_ni,
+			IN const osm_log_level_t log_level);
 /*
 * PARAMETERS
 *	p_log
@@ -348,10 +321,9 @@ void osm_dump_node_info(
 * SYNOPSIS
 */
 void
-osm_dump_sm_info(
-	IN osm_log_t* const p_log,
-	IN const ib_sm_info_t* const p_smi,
-	IN const osm_log_level_t log_level );
+osm_dump_sm_info(IN osm_log_t * const p_log,
+		 IN const ib_sm_info_t * const p_smi,
+		 IN const osm_log_level_t log_level);
 /*
 * PARAMETERS
 *	p_log
@@ -381,10 +353,9 @@ osm_dump_sm_info(
 * SYNOPSIS
 */
 void
-osm_dump_switch_info(
-	IN osm_log_t* const p_log,
-	IN const ib_switch_info_t* const p_si,
-	IN const osm_log_level_t log_level );
+osm_dump_switch_info(IN osm_log_t * const p_log,
+		     IN const ib_switch_info_t * const p_si,
+		     IN const osm_log_level_t log_level);
 /*
 * PARAMETERS
 *	p_log
@@ -414,10 +385,9 @@ osm_dump_switch_info(
 * SYNOPSIS
 */
 void
-osm_dump_notice(
-	IN osm_log_t* const p_log,
-	IN const ib_mad_notice_attr_t *p_ntci,
-	IN const osm_log_level_t log_level );
+osm_dump_notice(IN osm_log_t * const p_log,
+		IN const ib_mad_notice_attr_t * p_ntci,
+		IN const osm_log_level_t log_level);
 /*
 * PARAMETERS
 *	p_log
@@ -446,9 +416,7 @@ osm_dump_notice(
 *
 * SYNOPSIS
 */
-const char*
-osm_get_disp_msg_str(
-	IN cl_disp_msgid_t msg );
+const char *osm_get_disp_msg_str(IN cl_disp_msgid_t msg);
 /*
 * PARAMETERS
 *	msg
@@ -462,25 +430,21 @@ osm_get_disp_msg_str(
 * SEE ALSO
 *********/
 
-void osm_dump_dr_path(
-	IN osm_log_t* const p_log,
-	IN const osm_dr_path_t* const p_path,
-	IN const osm_log_level_t level );
+void osm_dump_dr_path(IN osm_log_t * const p_log,
+		      IN const osm_dr_path_t * const p_path,
+		      IN const osm_log_level_t level);
 
-void osm_dump_smp_dr_path(
-	IN osm_log_t* const p_log,
-	IN const ib_smp_t* const p_smp,
-	IN const osm_log_level_t level );
+void osm_dump_smp_dr_path(IN osm_log_t * const p_log,
+			  IN const ib_smp_t * const p_smp,
+			  IN const osm_log_level_t level);
 
-void osm_dump_dr_smp(
-	IN osm_log_t* const p_log,
-	IN const ib_smp_t* const p_smp,
-	IN const osm_log_level_t level );
+void osm_dump_dr_smp(IN osm_log_t * const p_log,
+		     IN const ib_smp_t * const p_smp,
+		     IN const osm_log_level_t level);
 
-void osm_dump_sa_mad(
-	IN osm_log_t* const p_log,
-	IN const ib_sa_mad_t* const p_smp,
-	IN const osm_log_level_t level );
+void osm_dump_sa_mad(IN osm_log_t * const p_log,
+		     IN const ib_sa_mad_t * const p_smp,
+		     IN const osm_log_level_t level);
 
 /****f* IBA Base: Types/osm_get_sm_state_str
 * NAME
@@ -491,9 +455,7 @@ void osm_dump_sa_mad(
 *
 * SYNOPSIS
 */
-const char*
-osm_get_sm_state_str(
-	IN osm_sm_state_t state );
+const char *osm_get_sm_state_str(IN osm_sm_state_t state);
 /*
 * PARAMETERS
 *	state
@@ -516,9 +478,7 @@ osm_get_sm_state_str(
 *
 * SYNOPSIS
 */
-const char*
-osm_get_sm_signal_str(
-	IN osm_signal_t signal );
+const char *osm_get_sm_signal_str(IN osm_signal_t signal);
 /*
 * PARAMETERS
 *	state
@@ -532,38 +492,21 @@ osm_get_sm_signal_str(
 * SEE ALSO
 *********/
 
-const char*
-osm_get_port_state_str_fixed_width(
-  IN uint8_t port_state );
+const char *osm_get_port_state_str_fixed_width(IN uint8_t port_state);
 
-const char*
-osm_get_node_type_str_fixed_width(
-	IN uint8_t node_type );
+const char *osm_get_node_type_str_fixed_width(IN uint8_t node_type);
 
-const char*
-osm_get_manufacturer_str(
-	IN uint64_t					const guid_ho );
+const char *osm_get_manufacturer_str(IN uint64_t const guid_ho);
 
-const char*
-osm_get_mtu_str(
-	IN uint8_t					const mtu );
+const char *osm_get_mtu_str(IN uint8_t const mtu);
 
-const char*
-osm_get_lwa_str(
-	IN uint8_t					const lwa );
+const char *osm_get_lwa_str(IN uint8_t const lwa);
 
-const char*
-osm_get_mtu_str(
-	IN uint8_t					const mtu );
+const char *osm_get_mtu_str(IN uint8_t const mtu);
 
-const char*
-osm_get_lwa_str(
-	IN uint8_t					const lwa );
-
-const char*
-osm_get_lsa_str(
-	IN uint8_t					const lsa );
+const char *osm_get_lwa_str(IN uint8_t const lwa);
 
+const char *osm_get_lsa_str(IN uint8_t const lsa);
 
 /****f* IBA Base: Types/osm_get_sm_mgr_signal_str
 * NAME
@@ -574,9 +517,7 @@ osm_get_lsa_str(
 *
 * SYNOPSIS
 */
-const char*
-osm_get_sm_mgr_signal_str(
-	IN osm_sm_signal_t signal );
+const char *osm_get_sm_mgr_signal_str(IN osm_sm_signal_t signal);
 /*
 * PARAMETERS
 *	signal
@@ -599,9 +540,7 @@ osm_get_sm_mgr_signal_str(
 *
 * SYNOPSIS
 */
-const char*
-osm_get_sm_mgr_state_str(
-	IN uint16_t state );
+const char *osm_get_sm_mgr_state_str(IN uint16_t state);
 /*
 * PARAMETERS
 *	state
@@ -616,5 +555,4 @@ osm_get_sm_mgr_state_str(
 *********/
 
 END_C_DECLS
-
-#endif	/* _OSM_HELPER_H_ */
+#endif				/* _OSM_HELPER_H_ */
diff --git a/opensm/include/opensm/osm_inform.h b/opensm/include/opensm/osm_inform.h
index 5c11f44..91c0c64 100644
--- a/opensm/include/opensm/osm_inform.h
+++ b/opensm/include/opensm/osm_inform.h
@@ -63,13 +63,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/Inform Record
 * NAME
 *	Inform Record
@@ -89,7 +88,6 @@ BEGIN_C_DECLS
 *    Eitan Zahavi, Mellanox
 *
 *********/
-
 /****s* OpenSM: Inform Record/osm_infr_t
 * NAME
 *	osm_infr_t
@@ -102,13 +100,12 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_infr_t
-{
-	cl_list_item_t		list_item;
-	osm_bind_handle_t	h_bind;
-	osm_infr_rcv_t*		p_infr_rcv;
-	osm_mad_addr_t		report_addr;
-	ib_inform_info_record_t	inform_record;
+typedef struct _osm_infr_t {
+	cl_list_item_t list_item;
+	osm_bind_handle_t h_bind;
+	osm_infr_rcv_t *p_infr_rcv;
+	osm_mad_addr_t report_addr;
+	ib_inform_info_record_t inform_record;
 } osm_infr_t;
 /*
 * FIELDS
@@ -139,9 +136,7 @@ typedef struct _osm_infr_t
 *
 * SYNOPSIS
 */
-osm_infr_t*
-osm_infr_new(
-	IN const osm_infr_t *p_infr_rec );
+osm_infr_t *osm_infr_new(IN const osm_infr_t * p_infr_rec);
 /*
 * PARAMETERS
 *	p_inf_rec
@@ -166,9 +161,7 @@ osm_infr_new(
 *
 * SYNOPSIS
 */
-void
-osm_infr_delete(
-	IN osm_infr_t* const p_infr );
+void osm_infr_delete(IN osm_infr_t * const p_infr);
 /*
 * PARAMETERS
 *	p_infr
@@ -187,11 +180,9 @@ osm_infr_delete(
 *
 * SYNOPSIS
 */
-osm_infr_t*
-osm_infr_get_by_rec(
-	IN osm_subn_t	const	*p_subn,
-	IN osm_log_t	*p_log,
-	IN osm_infr_t*	const	p_infr_rec );
+osm_infr_t *osm_infr_get_by_rec(IN osm_subn_t const *p_subn,
+				IN osm_log_t * p_log,
+				IN osm_infr_t * const p_infr_rec);
 /*
 * PARAMETERS
 *	p_subn
@@ -210,16 +201,12 @@ osm_infr_get_by_rec(
 *********/
 
 void
-osm_infr_insert_to_db(
-	IN osm_subn_t	*p_subn,
-	IN osm_log_t	*p_log,
-	IN osm_infr_t	*p_infr);
+osm_infr_insert_to_db(IN osm_subn_t * p_subn,
+		      IN osm_log_t * p_log, IN osm_infr_t * p_infr);
 
 void
-osm_infr_remove_from_db(
-	IN osm_subn_t	*p_subn,
-	IN osm_log_t	*p_log,
-	IN osm_infr_t	*p_infr);
+osm_infr_remove_from_db(IN osm_subn_t * p_subn,
+			IN osm_log_t * p_log, IN osm_infr_t * p_infr);
 
 /****f* OpenSM: Inform Record/osm_report_notice
 * NAME
@@ -236,10 +223,8 @@ osm_infr_remove_from_db(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_report_notice(
-	IN osm_log_t* const p_log,
-	IN osm_subn_t* p_subn,
-	IN ib_mad_notice_attr_t* p_ntc );
+osm_report_notice(IN osm_log_t * const p_log,
+		  IN osm_subn_t * p_subn, IN ib_mad_notice_attr_t * p_ntc);
 /*
 * PARAMETERS
 *	p_rcv
@@ -256,5 +241,4 @@ osm_report_notice(
 *********/
 
 END_C_DECLS
-
-#endif		/* _OSM_INFR_H_ */
+#endif				/* _OSM_INFR_H_ */
diff --git a/opensm/include/opensm/osm_lid_mgr.h b/opensm/include/opensm/osm_lid_mgr.h
index 78cbcb0..9a7d0e3 100644
--- a/opensm/include/opensm/osm_lid_mgr.h
+++ b/opensm/include/opensm/osm_lid_mgr.h
@@ -59,15 +59,13 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 #define OSM_LID_MGR_LIST_SIZE_MIN 256
-
 /****h* OpenSM/LID Manager
 * NAME
 *	LID Manager
@@ -85,7 +83,6 @@ BEGIN_C_DECLS
 *	Steve King, Intel
 *
 *********/
-
 /****s* OpenSM: LID Manager/osm_lid_mgr_t
 * NAME
 *	osm_lid_mgr_t
@@ -98,17 +95,16 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_lid_mgr
-{
-  osm_subn_t      *p_subn;
-  osm_db_t        *p_db;
-  osm_req_t       *p_req;
-  osm_log_t       *p_log;
-  cl_plock_t      *p_lock;
-  boolean_t        send_set_reqs;
-  osm_db_domain_t *p_g2l;
-  cl_ptr_vector_t  used_lids;
-  cl_qlist_t       free_ranges;
+typedef struct _osm_lid_mgr {
+	osm_subn_t *p_subn;
+	osm_db_t *p_db;
+	osm_req_t *p_req;
+	osm_log_t *p_log;
+	cl_plock_t *p_lock;
+	boolean_t send_set_reqs;
+	osm_db_domain_t *p_g2l;
+	cl_ptr_vector_t used_lids;
+	cl_qlist_t free_ranges;
 } osm_lid_mgr_t;
 /*
 * FIELDS
@@ -156,9 +152,7 @@ typedef struct _osm_lid_mgr
 *
 * SYNOPSIS
 */
-void
-osm_lid_mgr_construct(
-	IN osm_lid_mgr_t* const p_mgr );
+void osm_lid_mgr_construct(IN osm_lid_mgr_t * const p_mgr);
 /*
 * PARAMETERS
 *	p_mgr
@@ -188,9 +182,7 @@ osm_lid_mgr_construct(
 *
 * SYNOPSIS
 */
-void
-osm_lid_mgr_destroy(
-	IN osm_lid_mgr_t* const p_mgr );
+void osm_lid_mgr_destroy(IN osm_lid_mgr_t * const p_mgr);
 /*
 * PARAMETERS
 *	p_mgr
@@ -222,13 +214,11 @@ osm_lid_mgr_destroy(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_lid_mgr_init(
-	IN osm_lid_mgr_t* const p_mgr,
-	IN osm_req_t* const p_req,
-	IN osm_subn_t* const p_subn,
-	IN osm_db_t* const p_db,
-	IN osm_log_t* const p_log,
-	IN cl_plock_t* const p_lock );
+osm_lid_mgr_init(IN osm_lid_mgr_t * const p_mgr,
+		 IN osm_req_t * const p_req,
+		 IN osm_subn_t * const p_subn,
+		 IN osm_db_t * const p_db,
+		 IN osm_log_t * const p_log, IN cl_plock_t * const p_lock);
 /*
 * PARAMETERS
 *	p_mgr
@@ -270,9 +260,7 @@ osm_lid_mgr_init(
 *
 * SYNOPSIS
 */
-osm_signal_t
-osm_lid_mgr_process_sm(
-	IN osm_lid_mgr_t* const p_mgr );
+osm_signal_t osm_lid_mgr_process_sm(IN osm_lid_mgr_t * const p_mgr);
 /*
 * PARAMETERS
 *	p_mgr
@@ -300,9 +288,7 @@ osm_lid_mgr_process_sm(
 *
 * SYNOPSIS
 */
-osm_signal_t
-osm_lid_mgr_process_subnet(
-	IN osm_lid_mgr_t* const p_mgr );
+osm_signal_t osm_lid_mgr_process_subnet(IN osm_lid_mgr_t * const p_mgr);
 /*
 * PARAMETERS
 *	p_mgr
@@ -321,5 +307,4 @@ osm_lid_mgr_process_subnet(
 *********/
 
 END_C_DECLS
-
-#endif	/* _OSM_LID_MGR_H_ */
+#endif				/* _OSM_LID_MGR_H_ */
diff --git a/opensm/include/opensm/osm_lin_fwd_rcv.h b/opensm/include/opensm/osm_lin_fwd_rcv.h
index 4fe5b90..28402cc 100644
--- a/opensm/include/opensm/osm_lin_fwd_rcv.h
+++ b/opensm/include/opensm/osm_lin_fwd_rcv.h
@@ -57,13 +57,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/LFT Receiver
 * NAME
 *	LFT Receiver
@@ -81,7 +80,6 @@ BEGIN_C_DECLS
 *	Steve King, Intel
 *
 *********/
-
 /****s* OpenSM: LFT Receiver/osm_lft_rcv_t
 * NAME
 *	osm_lft_rcv_t
@@ -94,11 +92,10 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_lft_rcv
-{
-	osm_subn_t	*p_subn;
-	osm_log_t	*p_log;
-	cl_plock_t	*p_lock;
+typedef struct _osm_lft_rcv {
+	osm_subn_t *p_subn;
+	osm_log_t *p_log;
+	cl_plock_t *p_lock;
 } osm_lft_rcv_t;
 /*
 * FIELDS
@@ -124,8 +121,7 @@ typedef struct _osm_lft_rcv
 *
 * SYNOPSIS
 */
-void osm_lft_rcv_construct(
-	IN osm_lft_rcv_t* const p_rcv );
+void osm_lft_rcv_construct(IN osm_lft_rcv_t * const p_rcv);
 /*
 * PARAMETERS
 *	p_rcv
@@ -155,8 +151,7 @@ void osm_lft_rcv_construct(
 *
 * SYNOPSIS
 */
-void osm_lft_rcv_destroy(
-	IN osm_lft_rcv_t* const p_rcv );
+void osm_lft_rcv_destroy(IN osm_lft_rcv_t * const p_rcv);
 /*
 * PARAMETERS
 *	p_rcv
@@ -187,11 +182,10 @@ void osm_lft_rcv_destroy(
 *
 * SYNOPSIS
 */
-ib_api_status_t osm_lft_rcv_init(
-	IN osm_lft_rcv_t* const p_rcv,
-	IN osm_subn_t* const p_subn,
-	IN osm_log_t* const p_log,
-	IN cl_plock_t* const p_lock );
+ib_api_status_t osm_lft_rcv_init(IN osm_lft_rcv_t * const p_rcv,
+				 IN osm_subn_t * const p_subn,
+				 IN osm_log_t * const p_log,
+				 IN cl_plock_t * const p_lock);
 /*
 * PARAMETERS
 *	p_rcv
@@ -227,9 +221,7 @@ ib_api_status_t osm_lft_rcv_init(
 *
 * SYNOPSIS
 */
-void osm_lft_rcv_process(
-	IN void *context,
-	IN void *data );
+void osm_lft_rcv_process(IN void *context, IN void *data);
 /*
 * PARAMETERS
 *	context
@@ -250,5 +242,4 @@ void osm_lft_rcv_process(
 *********/
 
 END_C_DECLS
-
-#endif	/* _OSM_LFT_RCV_H_ */
+#endif				/* _OSM_LFT_RCV_H_ */
diff --git a/opensm/include/opensm/osm_lin_fwd_tbl.h b/opensm/include/opensm/osm_lin_fwd_tbl.h
index bcaac60..c43ee15 100644
--- a/opensm/include/opensm/osm_lin_fwd_tbl.h
+++ b/opensm/include/opensm/osm_lin_fwd_tbl.h
@@ -55,13 +55,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/Linear Forwarding Table
 * NAME
 *	Linear Forwarding Table
@@ -79,7 +78,6 @@ BEGIN_C_DECLS
 *	Steve King, Intel
 *
 *********/
-
 /****s* OpenSM: Forwarding Table/osm_lin_fwd_tbl_t
 * NAME
 *	osm_lin_fwd_tbl_t
@@ -91,10 +89,9 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_lin_fwd_tbl
-{
-	uint16_t	size;
-	uint8_t		port_tbl[1];
+typedef struct _osm_lin_fwd_tbl {
+	uint16_t size;
+	uint8_t port_tbl[1];
 } osm_lin_fwd_tbl_t;
 /*
 * FIELDS
@@ -119,9 +116,7 @@ typedef struct _osm_lin_fwd_tbl
 *
 * SYNOPSIS
 */
-osm_lin_fwd_tbl_t*
-osm_lin_tbl_new(
-	IN uint16_t const size );
+osm_lin_fwd_tbl_t *osm_lin_tbl_new(IN uint16_t const size);
 /*
 * PARAMETERS
 *	size
@@ -146,9 +141,7 @@ osm_lin_tbl_new(
 *
 * SYNOPSIS
 */
-void
-osm_lin_tbl_delete(
-	IN osm_lin_fwd_tbl_t** const pp_tbl );
+void osm_lin_tbl_delete(IN osm_lin_fwd_tbl_t ** const pp_tbl);
 /*
 * PARAMETERS
 *	pp_tbl
@@ -174,15 +167,14 @@ osm_lin_tbl_delete(
 * SYNOPSIS
 */
 static inline void
-osm_lin_fwd_tbl_set(
-	IN osm_lin_fwd_tbl_t* const p_tbl,
-	IN const uint16_t lid_ho,
-	IN const uint8_t port )
+osm_lin_fwd_tbl_set(IN osm_lin_fwd_tbl_t * const p_tbl,
+		    IN const uint16_t lid_ho, IN const uint8_t port)
 {
-	CL_ASSERT( lid_ho < p_tbl->size );
-	if( lid_ho < p_tbl->size )
+	CL_ASSERT(lid_ho < p_tbl->size);
+	if (lid_ho < p_tbl->size)
 		p_tbl->port_tbl[lid_ho] = port;
 }
+
 /*
 * PARAMETERS
 *	p_tbl
@@ -212,15 +204,15 @@ osm_lin_fwd_tbl_set(
 * SYNOPSIS
 */
 static inline uint8_t
-osm_lin_fwd_tbl_get(
-	IN const osm_lin_fwd_tbl_t* const p_tbl,
-	IN const uint16_t lid_ho )
+osm_lin_fwd_tbl_get(IN const osm_lin_fwd_tbl_t * const p_tbl,
+		    IN const uint16_t lid_ho)
 {
-	if( lid_ho < p_tbl->size )
-		return( p_tbl->port_tbl[lid_ho] );
+	if (lid_ho < p_tbl->size)
+		return (p_tbl->port_tbl[lid_ho]);
 	else
-		return( 0xFF );
+		return (0xFF);
 }
+
 /*
 * PARAMETERS
 *	p_tbl
@@ -247,11 +239,11 @@ osm_lin_fwd_tbl_get(
 * SYNOPSIS
 */
 static inline uint16_t
-osm_lin_fwd_tbl_get_size(
-	IN const osm_lin_fwd_tbl_t* const p_tbl )
+osm_lin_fwd_tbl_get_size(IN const osm_lin_fwd_tbl_t * const p_tbl)
 {
-	return( p_tbl->size );
+	return (p_tbl->size);
 }
+
 /*
 * PARAMETERS
 *	p_tbl
@@ -275,12 +267,12 @@ osm_lin_fwd_tbl_get_size(
 * SYNOPSIS
 */
 static inline uint16_t
-osm_lin_fwd_tbl_get_lids_per_block(
-	IN const osm_lin_fwd_tbl_t* const p_tbl )
+osm_lin_fwd_tbl_get_lids_per_block(IN const osm_lin_fwd_tbl_t * const p_tbl)
 {
-	UNUSED_PARAM( p_tbl );
-	return( 64 );
+	UNUSED_PARAM(p_tbl);
+	return (64);
 }
+
 /*
 * PARAMETERS
 *	p_tbl
@@ -304,13 +296,14 @@ osm_lin_fwd_tbl_get_lids_per_block(
 * SYNOPSIS
 */
 static inline uint16_t
-osm_lin_fwd_tbl_get_max_block_id_in_use(
-	IN const osm_lin_fwd_tbl_t* const p_tbl,
-	IN const uint16_t lid_top_ho )
+osm_lin_fwd_tbl_get_max_block_id_in_use(IN const osm_lin_fwd_tbl_t *
+					const p_tbl,
+					IN const uint16_t lid_top_ho)
 {
-	return( (uint16_t)(lid_top_ho /
-			osm_lin_fwd_tbl_get_lids_per_block( p_tbl ) ) );
+	return ((uint16_t) (lid_top_ho /
+			    osm_lin_fwd_tbl_get_lids_per_block(p_tbl)));
 }
+
 /*
 * PARAMETERS
 *	p_tbl
@@ -334,26 +327,26 @@ osm_lin_fwd_tbl_get_max_block_id_in_use(
 * SYNOPSIS
 */
 static inline ib_api_status_t
-osm_lin_fwd_tbl_set_block(
-	IN osm_lin_fwd_tbl_t* const p_tbl,
-	IN const uint8_t* const p_block,
-	IN const uint32_t block_num )
+osm_lin_fwd_tbl_set_block(IN osm_lin_fwd_tbl_t * const p_tbl,
+			  IN const uint8_t * const p_block,
+			  IN const uint32_t block_num)
 {
 	uint16_t lid_start;
 	uint16_t num_lids;
 
-	CL_ASSERT( p_tbl );
-	CL_ASSERT( p_block );
+	CL_ASSERT(p_tbl);
+	CL_ASSERT(p_block);
 
-	num_lids = osm_lin_fwd_tbl_get_lids_per_block( p_tbl );
-	lid_start = (uint16_t)(block_num * num_lids);
+	num_lids = osm_lin_fwd_tbl_get_lids_per_block(p_tbl);
+	lid_start = (uint16_t) (block_num * num_lids);
 
-	if( lid_start + num_lids > p_tbl->size )
-		return( IB_INVALID_PARAMETER );
+	if (lid_start + num_lids > p_tbl->size)
+		return (IB_INVALID_PARAMETER);
 
-	memcpy( &p_tbl->port_tbl[lid_start], p_block, num_lids );
-	return( IB_SUCCESS );
+	memcpy(&p_tbl->port_tbl[lid_start], p_block, num_lids);
+	return (IB_SUCCESS);
 }
+
 /*
 * PARAMETERS
 *	p_tbl
@@ -374,5 +367,4 @@ osm_lin_fwd_tbl_set_block(
 *********/
 
 END_C_DECLS
-
-#endif		/* _OSM_LIN_FWD_TBL_H_ */
+#endif				/* _OSM_LIN_FWD_TBL_H_ */
diff --git a/opensm/include/opensm/osm_link_mgr.h b/opensm/include/opensm/osm_link_mgr.h
index 465db16..214dd80 100644
--- a/opensm/include/opensm/osm_link_mgr.h
+++ b/opensm/include/opensm/osm_link_mgr.h
@@ -58,13 +58,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/Link Manager
 * NAME
 *	Link Manager
@@ -82,7 +81,6 @@ BEGIN_C_DECLS
 *	Steve King, Intel
 *
 *********/
-
 /****s* OpenSM: Link Manager/osm_link_mgr_t
 * NAME
 *	osm_link_mgr_t
@@ -95,13 +93,12 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_link_mgr
-{
-	osm_subn_t					*p_subn;
-	osm_req_t					*p_req;
-	osm_log_t					*p_log;
-	cl_plock_t					*p_lock;
-	boolean_t					send_set_reqs;
+typedef struct _osm_link_mgr {
+	osm_subn_t *p_subn;
+	osm_req_t *p_req;
+	osm_log_t *p_log;
+	cl_plock_t *p_lock;
+	boolean_t send_set_reqs;
 
 } osm_link_mgr_t;
 /*
@@ -134,9 +131,7 @@ typedef struct _osm_link_mgr
 *
 * SYNOPSIS
 */
-void
-osm_link_mgr_construct(
-	IN osm_link_mgr_t* const p_mgr );
+void osm_link_mgr_construct(IN osm_link_mgr_t * const p_mgr);
 /*
 * PARAMETERS
 *	p_mgr
@@ -166,9 +161,7 @@ osm_link_mgr_construct(
 *
 * SYNOPSIS
 */
-void
-osm_link_mgr_destroy(
-	IN osm_link_mgr_t* const p_mgr );
+void osm_link_mgr_destroy(IN osm_link_mgr_t * const p_mgr);
 /*
 * PARAMETERS
 *	p_mgr
@@ -200,12 +193,10 @@ osm_link_mgr_destroy(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_link_mgr_init(
-	IN osm_link_mgr_t* const p_mgr,
-	IN osm_req_t* const p_req,
-	IN osm_subn_t* const p_subn,
-	IN osm_log_t* const p_log,
-	IN cl_plock_t* const p_lock );
+osm_link_mgr_init(IN osm_link_mgr_t * const p_mgr,
+		  IN osm_req_t * const p_req,
+		  IN osm_subn_t * const p_subn,
+		  IN osm_log_t * const p_log, IN cl_plock_t * const p_lock);
 /*
 * PARAMETERS
 *	p_mgr
@@ -245,9 +236,8 @@ osm_link_mgr_init(
 * SYNOPSIS
 */
 osm_signal_t
-osm_link_mgr_process(
-	IN osm_link_mgr_t* const p_mgr,
-	IN const uint8_t link_state );
+osm_link_mgr_process(IN osm_link_mgr_t * const p_mgr,
+		     IN const uint8_t link_state);
 /*
 * PARAMETERS
 *	p_mgr
@@ -270,5 +260,4 @@ osm_link_mgr_process(
 *********/
 
 END_C_DECLS
-
-#endif	/* _OSM_LINK_MGR_H_ */
+#endif				/* _OSM_LINK_MGR_H_ */
diff --git a/opensm/include/opensm/osm_log.h b/opensm/include/opensm/osm_log.h
index a556ad2..6c487aa 100644
--- a/opensm/include/opensm/osm_log.h
+++ b/opensm/include/opensm/osm_log.h
@@ -65,26 +65,21 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 #define LOG_ENTRY_SIZE_MAX		4096
 #define BUF_SIZE			LOG_ENTRY_SIZE_MAX
-
 #define __func__ __FUNCTION__
-
 #define OSM_LOG_ENTER( OSM_LOG_PTR, NAME ) \
 	osm_log( OSM_LOG_PTR, OSM_LOG_FUNCS, \
 		 "%s: [\n", __func__);
-
 #define OSM_LOG_EXIT( OSM_LOG_PTR ) \
 	osm_log( OSM_LOG_PTR, OSM_LOG_FUNCS, \
 		 "%s: ]\n", __func__);
-
 /****h* OpenSM/Log
 * NAME
 *	Log
@@ -119,17 +114,16 @@ typedef uint8_t osm_log_level_t;
 *
 * SYNOPSIS
 */
-typedef struct _osm_log
-{
-	osm_log_level_t			level;
-	cl_spinlock_t			lock;
-	unsigned long			count;
-	unsigned long                   max_size;
-	boolean_t			flush;
-	FILE*				out_port;
-  	boolean_t			accum_log_file;
-	boolean_t			daemon;
-        char*				log_file_name;
+typedef struct _osm_log {
+	osm_log_level_t level;
+	cl_spinlock_t lock;
+	unsigned long count;
+	unsigned long max_size;
+	boolean_t flush;
+	FILE *out_port;
+	boolean_t accum_log_file;
+	boolean_t daemon;
+	char *log_file_name;
 } osm_log_t;
 /*********/
 
@@ -142,12 +136,11 @@ typedef struct _osm_log
 *
 * SYNOPSIS
 */
-static inline void
-osm_log_construct(
-	IN osm_log_t* const p_log )
+static inline void osm_log_construct(IN osm_log_t * const p_log)
 {
-	cl_spinlock_construct( &p_log->lock );
+	cl_spinlock_construct(&p_log->lock);
 }
+
 /*
 * PARAMETERS
 *	p_log
@@ -177,17 +170,16 @@ osm_log_construct(
 *
 * SYNOPSIS
 */
-static inline void
-osm_log_destroy(
-	IN osm_log_t* const p_log )
+static inline void osm_log_destroy(IN osm_log_t * const p_log)
 {
-	cl_spinlock_destroy( &p_log->lock );
+	cl_spinlock_destroy(&p_log->lock);
 	if (p_log->out_port != stdout) {
-	  fclose(p_log->out_port);
-	  p_log->out_port = stdout;
+		fclose(p_log->out_port);
+		p_log->out_port = stdout;
 	}
 	closelog();
 }
+
 /*
 * PARAMETERS
 *	p_log
@@ -219,13 +211,12 @@ osm_log_destroy(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_log_init_v2(
-  IN osm_log_t* const p_log,
-  IN const boolean_t flush,
-  IN const uint8_t log_flags,
-  IN const char *log_file,
-  IN const unsigned long max_size,
-  IN const boolean_t accum_log_file );
+osm_log_init_v2(IN osm_log_t * const p_log,
+		IN const boolean_t flush,
+		IN const uint8_t log_flags,
+		IN const char *log_file,
+		IN const unsigned long max_size,
+		IN const boolean_t accum_log_file);
 /*
 * PARAMETERS
 *	p_log
@@ -263,9 +254,7 @@ osm_log_init_v2(
 *
 * SYNOPSIS
 */
-int
-osm_log_reopen_file(
-	osm_log_t *p_log);
+int osm_log_reopen_file(osm_log_t * p_log);
 /*
 * PARAMETERS
 *	p_log
@@ -286,12 +275,10 @@ osm_log_reopen_file(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_log_init(
-  IN osm_log_t* const p_log,
-  IN const boolean_t flush,
-  IN const uint8_t log_flags,
-  IN const char *log_file,
-  IN const boolean_t accum_log_file );
+osm_log_init(IN osm_log_t * const p_log,
+	     IN const boolean_t flush,
+	     IN const uint8_t log_flags,
+	     IN const char *log_file, IN const boolean_t accum_log_file);
 /*
  * Same as osm_log_init_v2() but without max_size parameter
  */
@@ -306,11 +293,11 @@ osm_log_init(
 * SYNOPSIS
 */
 static inline osm_log_level_t
-osm_log_get_level(
-	IN const osm_log_t* const p_log )
+osm_log_get_level(IN const osm_log_t * const p_log)
 {
-	return( p_log->level );
+	return (p_log->level);
 }
+
 /*
 * PARAMETERS
 *	p_log
@@ -336,12 +323,11 @@ osm_log_get_level(
 * SYNOPSIS
 */
 static inline void
-osm_log_set_level(
-	IN osm_log_t* const p_log,
-	IN const osm_log_level_t level )
+osm_log_set_level(IN osm_log_t * const p_log, IN const osm_log_level_t level)
 {
 	p_log->level = level;
 }
+
 /*
 * PARAMETERS
 *	p_log
@@ -371,12 +357,12 @@ osm_log_set_level(
 * SYNOPSIS
 */
 static inline boolean_t
-osm_log_is_active(
-	IN const osm_log_t* const p_log,
-	IN const osm_log_level_t level )
+osm_log_is_active(IN const osm_log_t * const p_log,
+		  IN const osm_log_level_t level)
 {
-	return( (p_log->level & level) != 0 );
+	return ((p_log->level & level) != 0);
 }
+
 /*
 * PARAMETERS
 *	p_log
@@ -396,20 +382,17 @@ osm_log_is_active(
 *	osm_log_destroy
 *********/
 
-extern int osm_log_printf(osm_log_t *p_log, osm_log_level_t level,
+extern int osm_log_printf(osm_log_t * p_log, osm_log_level_t level,
 			  const char *fmt, ...);
 
 void
-osm_log(
-	IN osm_log_t* const p_log,
+osm_log(IN osm_log_t * const p_log,
 	IN const osm_log_level_t verbosity,
-	IN const char *p_str, ... ) STRICT_OSM_LOG_FORMAT;
+	IN const char *p_str, ...) STRICT_OSM_LOG_FORMAT;
 
 void
-osm_log_raw(
-	IN osm_log_t* const p_log,
-	IN const osm_log_level_t verbosity,
-	IN const char *p_buf );
+osm_log_raw(IN osm_log_t * const p_log,
+	    IN const osm_log_level_t verbosity, IN const char *p_buf);
 
 #define DBG_CL_LOCK 0
 
@@ -479,8 +462,7 @@ osm_log_raw(
 *
 * SYNOPSIS
 */
-boolean_t
-osm_is_debug(void);
+boolean_t osm_is_debug(void);
 /*
 * PARAMETERS
 *    None
@@ -493,5 +475,4 @@ osm_is_debug(void);
 *********/
 
 END_C_DECLS
-
-#endif		/* _OSM_LOG_H_ */
+#endif				/* _OSM_LOG_H_ */
diff --git a/opensm/include/opensm/osm_mad_pool.h b/opensm/include/opensm/osm_mad_pool.h
index 7a3593d..9ec0a7a 100644
--- a/opensm/include/opensm/osm_mad_pool.h
+++ b/opensm/include/opensm/osm_mad_pool.h
@@ -59,13 +59,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/MAD Pool
 * NAME
 *	MAD Pool
@@ -84,7 +83,6 @@ BEGIN_C_DECLS
 *	Steve King, Intel
 *
 *********/
-
 /****s* OpenSM: MAD Pool/osm_mad_pool_t
 * NAME
 *	osm_mad_pool_t
@@ -97,11 +95,10 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_mad_pool
-{
-	osm_log_t					*p_log;
-	cl_qlock_pool_t				madw_pool;
-	atomic32_t					mads_out;
+typedef struct _osm_mad_pool {
+	osm_log_t *p_log;
+	cl_qlock_pool_t madw_pool;
+	atomic32_t mads_out;
 } osm_mad_pool_t;
 /*
 * FIELDS
@@ -127,8 +124,7 @@ typedef struct _osm_mad_pool
 *
 * SYNOPSIS
 */
-void osm_mad_pool_construct(
-	IN osm_mad_pool_t* const p_pool );
+void osm_mad_pool_construct(IN osm_mad_pool_t * const p_pool);
 /*
 * PARAMETERS
 *	p_pool
@@ -157,8 +153,7 @@ void osm_mad_pool_construct(
 *
 * SYNOPSIS
 */
-void osm_mad_pool_destroy(
-	IN osm_mad_pool_t* const p_pool );
+void osm_mad_pool_destroy(IN osm_mad_pool_t * const p_pool);
 /*
 * PARAMETERS
 *	p_pool
@@ -186,9 +181,8 @@ void osm_mad_pool_destroy(
 *
 * SYNOPSIS
 */
-ib_api_status_t osm_mad_pool_init(
-	IN osm_mad_pool_t* const p_pool,
-	IN osm_log_t* const p_log );
+ib_api_status_t osm_mad_pool_init(IN osm_mad_pool_t * const p_pool,
+				  IN osm_log_t * const p_log);
 /*
 * PARAMETERS
 *	p_pool
@@ -217,12 +211,10 @@ ib_api_status_t osm_mad_pool_init(
 *
 * SYNOPSIS
 */
-osm_madw_t*
-osm_mad_pool_get(
-	IN osm_mad_pool_t* const p_pool,
-	IN osm_bind_handle_t h_bind,
-	IN const uint32_t total_size,
-	IN const osm_mad_addr_t* const p_mad_addr );
+osm_madw_t *osm_mad_pool_get(IN osm_mad_pool_t * const p_pool,
+			     IN osm_bind_handle_t h_bind,
+			     IN const uint32_t total_size,
+			     IN const osm_mad_addr_t * const p_mad_addr);
 /*
 * PARAMETERS
 *	p_pool
@@ -263,9 +255,8 @@ osm_mad_pool_get(
 *
 * SYNOPSIS
 */
-void osm_mad_pool_put(
-	IN osm_mad_pool_t* const p_pool,
-	IN osm_madw_t* const p_madw );
+void osm_mad_pool_put(IN osm_mad_pool_t * const p_pool,
+		      IN osm_madw_t * const p_madw);
 /*
 * PARAMETERS
 *	p_pool
@@ -295,13 +286,12 @@ void osm_mad_pool_put(
 *
 * SYNOPSIS
 */
-osm_madw_t*
-osm_mad_pool_get_wrapper(
-	IN osm_mad_pool_t* const p_pool,
-	IN osm_bind_handle_t h_bind,
-	IN const uint32_t total_size,
-	IN const ib_mad_t* const p_mad,
-	IN const osm_mad_addr_t* const p_mad_addr );
+osm_madw_t *osm_mad_pool_get_wrapper(IN osm_mad_pool_t * const p_pool,
+				     IN osm_bind_handle_t h_bind,
+				     IN const uint32_t total_size,
+				     IN const ib_mad_t * const p_mad,
+				     IN const osm_mad_addr_t *
+				     const p_mad_addr);
 /*
 * PARAMETERS
 *	p_pool
@@ -346,9 +336,7 @@ osm_mad_pool_get_wrapper(
 *
 * SYNOPSIS
 */
-osm_madw_t*
-osm_mad_pool_get_wrapper_raw(
-	IN osm_mad_pool_t* const p_pool );
+osm_madw_t *osm_mad_pool_get_wrapper_raw(IN osm_mad_pool_t * const p_pool);
 /*
 * PARAMETERS
 *	p_pool
@@ -379,11 +367,11 @@ osm_mad_pool_get_wrapper_raw(
 * SYNOPSIS
 */
 static inline uint32_t
-osm_mad_pool_get_outstanding(
-	IN const osm_mad_pool_t* const p_pool )
+osm_mad_pool_get_outstanding(IN const osm_mad_pool_t * const p_pool)
 {
-	return( p_pool->mads_out );
+	return (p_pool->mads_out);
 }
+
 /*
 * PARAMETERS
 *	p_pool
@@ -401,5 +389,4 @@ osm_mad_pool_get_outstanding(
 *********/
 
 END_C_DECLS
-
-#endif	/* _OSM_MAD_POOL_H_ */
+#endif				/* _OSM_MAD_POOL_H_ */
diff --git a/opensm/include/opensm/osm_madw.h b/opensm/include/opensm/osm_madw.h
index 6d1ab04..b996037 100644
--- a/opensm/include/opensm/osm_madw.h
+++ b/opensm/include/opensm/osm_madw.h
@@ -58,13 +58,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****s* OpenSM: MAD Wrapper/osm_bind_info_t
 * NAME
 *   osm_bind_info_t
@@ -73,16 +72,15 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_bind_info
-{
-    ib_net64_t		port_guid;
-    uint8_t		mad_class;
-    uint8_t		class_version;
-    boolean_t		is_responder;
-    boolean_t		is_trap_processor;
-    boolean_t		is_report_processor;
-    uint32_t		send_q_size;
-    uint32_t		recv_q_size;
+typedef struct _osm_bind_info {
+	ib_net64_t port_guid;
+	uint8_t mad_class;
+	uint8_t class_version;
+	boolean_t is_responder;
+	boolean_t is_trap_processor;
+	boolean_t is_report_processor;
+	uint32_t send_q_size;
+	uint32_t recv_q_size;
 } osm_bind_info_t;
 /*
 * FIELDS
@@ -142,13 +140,12 @@ typedef struct _osm_bind_info
 *
 * SYNOPSIS
 */
-typedef struct _osm_ni_context
-{
-  ib_net64_t			node_guid;
-  uint8_t			port_num;
-  ib_net64_t			dup_node_guid;
-  uint8_t			dup_port_num;
-  unsigned			dup_count;
+typedef struct _osm_ni_context {
+	ib_net64_t node_guid;
+	uint8_t port_num;
+	ib_net64_t dup_node_guid;
+	uint8_t dup_port_num;
+	unsigned dup_count;
 } osm_ni_context_t;
 /*
 * FIELDS
@@ -175,15 +172,14 @@ typedef struct _osm_ni_context
 *
 * SYNOPSIS
 */
-typedef struct _osm_pi_context
-{
-  ib_net64_t			node_guid;
-  ib_net64_t			port_guid;
-  boolean_t			set_method;
-  boolean_t			light_sweep;
-  boolean_t			update_master_sm_base_lid;
-  boolean_t			ignore_errors;
-  boolean_t			active_transition;
+typedef struct _osm_pi_context {
+	ib_net64_t node_guid;
+	ib_net64_t port_guid;
+	boolean_t set_method;
+	boolean_t light_sweep;
+	boolean_t update_master_sm_base_lid;
+	boolean_t ignore_errors;
+	boolean_t active_transition;
 } osm_pi_context_t;
 /*********/
 
@@ -196,9 +192,8 @@ typedef struct _osm_pi_context
 *
 * SYNOPSIS
 */
-typedef struct _osm_nd_context
-{
-	ib_net64_t			node_guid;
+typedef struct _osm_nd_context {
+	ib_net64_t node_guid;
 } osm_nd_context_t;
 /*********/
 
@@ -211,11 +206,10 @@ typedef struct _osm_nd_context
 *
 * SYNOPSIS
 */
-typedef struct _osm_si_context
-{
-	ib_net64_t			node_guid;
-	boolean_t			set_method;
-	boolean_t			light_sweep;
+typedef struct _osm_si_context {
+	ib_net64_t node_guid;
+	boolean_t set_method;
+	boolean_t light_sweep;
 } osm_si_context_t;
 /*********/
 
@@ -228,10 +222,9 @@ typedef struct _osm_si_context
 *
 * SYNOPSIS
 */
-typedef struct _osm_lft_context
-{
-	ib_net64_t			node_guid;
-	boolean_t			set_method;
+typedef struct _osm_lft_context {
+	ib_net64_t node_guid;
+	boolean_t set_method;
 } osm_lft_context_t;
 /*********/
 
@@ -244,10 +237,9 @@ typedef struct _osm_lft_context
 *
 * SYNOPSIS
 */
-typedef struct _osm_mft_context
-{
-	ib_net64_t			node_guid;
-	boolean_t			set_method;
+typedef struct _osm_mft_context {
+	ib_net64_t node_guid;
+	boolean_t set_method;
 } osm_mft_context_t;
 /*********/
 
@@ -260,10 +252,9 @@ typedef struct _osm_mft_context
 *
 * SYNOPSIS
 */
-typedef struct _osm_smi_context
-{
-  ib_net64_t		port_guid;
-  boolean_t		set_method;
+typedef struct _osm_smi_context {
+	ib_net64_t port_guid;
+	boolean_t set_method;
 } osm_smi_context_t;
 /*********/
 
@@ -276,11 +267,10 @@ typedef struct _osm_smi_context
 *
 * SYNOPSIS
 */
-typedef struct _osm_pkey_context
-{
-  ib_net64_t			node_guid;
-  ib_net64_t			port_guid;
-  boolean_t			set_method;
+typedef struct _osm_pkey_context {
+	ib_net64_t node_guid;
+	ib_net64_t port_guid;
+	boolean_t set_method;
 } osm_pkey_context_t;
 /*********/
 
@@ -293,11 +283,10 @@ typedef struct _osm_pkey_context
 *
 * SYNOPSIS
 */
-typedef struct _osm_slvl_context
-{
-  ib_net64_t			node_guid;
-  ib_net64_t			port_guid;
-  boolean_t			set_method;
+typedef struct _osm_slvl_context {
+	ib_net64_t node_guid;
+	ib_net64_t port_guid;
+	boolean_t set_method;
 } osm_slvl_context_t;
 /*********/
 
@@ -310,11 +299,10 @@ typedef struct _osm_slvl_context
 *
 * SYNOPSIS
 */
-typedef struct _osm_vla_context
-{
-  ib_net64_t			node_guid;
-  ib_net64_t			port_guid;
-  boolean_t			set_method;
+typedef struct _osm_vla_context {
+	ib_net64_t node_guid;
+	ib_net64_t port_guid;
+	boolean_t set_method;
 } osm_vla_context_t;
 /*********/
 
@@ -323,11 +311,11 @@ typedef struct _osm_vla_context
 *	Context for Performance manager queries
 */
 typedef struct _osm_perfmgr_context {
-  uint64_t node_guid;
-  uint16_t port;
-  uint8_t mad_method; /* was this a get or a set */
+	uint64_t node_guid;
+	uint16_t port;
+	uint8_t mad_method;	/* was this a get or a set */
 #if 0
-  struct timeval query_start;
+	struct timeval query_start;
 #endif
 } osm_perfmgr_context_t;
 /*********/
@@ -342,10 +330,9 @@ typedef struct _osm_perfmgr_context {
 *
 * SYNOPSIS
 */
-typedef struct _osm_arbitrary_context
-{
-  void*             context1;
-  void*             context2;
+typedef struct _osm_arbitrary_context {
+	void *context1;
+	void *context2;
 } osm_arbitrary_context_t;
 /*********/
 #endif
@@ -359,19 +346,18 @@ typedef struct _osm_arbitrary_context
 *
 * SYNOPSIS
 */
-typedef union _osm_madw_context
-{
-	osm_ni_context_t	ni_context;
-	osm_pi_context_t	pi_context;
-	osm_nd_context_t	nd_context;
-	osm_si_context_t	si_context;
-	osm_lft_context_t	lft_context;
-	osm_mft_context_t	mft_context;
-	osm_smi_context_t	smi_context;
-	osm_slvl_context_t	slvl_context;
-	osm_pkey_context_t	pkey_context;
-	osm_vla_context_t	vla_context;
-	osm_perfmgr_context_t	perfmgr_context;
+typedef union _osm_madw_context {
+	osm_ni_context_t ni_context;
+	osm_pi_context_t pi_context;
+	osm_nd_context_t nd_context;
+	osm_si_context_t si_context;
+	osm_lft_context_t lft_context;
+	osm_mft_context_t mft_context;
+	osm_smi_context_t smi_context;
+	osm_slvl_context_t slvl_context;
+	osm_pkey_context_t pkey_context;
+	osm_vla_context_t vla_context;
+	osm_perfmgr_context_t perfmgr_context;
 #ifndef OSM_VENDOR_INTF_OPENIB
 	osm_arbitrary_context_t arb_context;
 #endif
@@ -386,30 +372,26 @@ typedef union _osm_madw_context
 *
 * SYNOPSIS
 */
-typedef struct _osm_mad_addr
-{
-    ib_net16_t	dest_lid;
-    uint8_t	path_bits;
-    uint8_t	static_rate;
-
-    union addr_type
-    {
-        struct _smi
-		{
-		  ib_net16_t		source_lid;
-		  uint8_t		port_num;
-        } smi;
-
-        struct _gsi
-		{
-            ib_net32_t    		remote_qp;
-            ib_net32_t			remote_qkey;
-            ib_net16_t   		pkey;
-            uint8_t       		service_level;
-            boolean_t			global_route;
-            ib_grh_t		   	grh_info;
-        } gsi;
-    } addr_type;
+typedef struct _osm_mad_addr {
+	ib_net16_t dest_lid;
+	uint8_t path_bits;
+	uint8_t static_rate;
+
+	union addr_type {
+		struct _smi {
+			ib_net16_t source_lid;
+			uint8_t port_num;
+		} smi;
+
+		struct _gsi {
+			ib_net32_t remote_qp;
+			ib_net32_t remote_qkey;
+			ib_net16_t pkey;
+			uint8_t service_level;
+			boolean_t global_route;
+			ib_grh_t grh_info;
+		} gsi;
+	} addr_type;
 
 } osm_mad_addr_t;
 /*
@@ -427,19 +409,18 @@ typedef struct _osm_mad_addr
 *
 * SYNOPSIS
 */
-typedef struct _osm_madw
-{
-	cl_pool_item_t					pool_item;
-	osm_bind_handle_t				h_bind;
-	osm_vend_wrap_t					vend_wrap;
-	osm_mad_addr_t					mad_addr;
-	osm_bind_info_t					bind_info;
-	osm_madw_context_t				context;
-	uint32_t					mad_size;
-	ib_api_status_t					status;
-	cl_disp_msgid_t					fail_msg;
-	boolean_t					resp_expected;
-	const ib_mad_t					*p_mad;
+typedef struct _osm_madw {
+	cl_pool_item_t pool_item;
+	osm_bind_handle_t h_bind;
+	osm_vend_wrap_t vend_wrap;
+	osm_mad_addr_t mad_addr;
+	osm_bind_info_t bind_info;
+	osm_madw_context_t context;
+	uint32_t mad_size;
+	ib_api_status_t status;
+	cl_disp_msgid_t fail_msg;
+	boolean_t resp_expected;
+	const ib_mad_t *p_mad;
 } osm_madw_t;
 /*
 * FIELDS
@@ -496,17 +477,16 @@ typedef struct _osm_madw
 *
 * SYNOPSIS
 */
-static inline void
-osm_madw_construct(
-	IN osm_madw_t* const p_madw )
+static inline void osm_madw_construct(IN osm_madw_t * const p_madw)
 {
 	/*
-		Don't touch the pool_item since that is an opaque object.
-		Clear all other objects in the mad wrapper.
-	*/
-	memset( ((uint8_t *)p_madw) + sizeof( cl_pool_item_t ), 0,
-		sizeof(*p_madw) - sizeof( cl_pool_item_t ) );
+	   Don't touch the pool_item since that is an opaque object.
+	   Clear all other objects in the mad wrapper.
+	 */
+	memset(((uint8_t *) p_madw) + sizeof(cl_pool_item_t), 0,
+	       sizeof(*p_madw) - sizeof(cl_pool_item_t));
 }
+
 /*
 * PARAMETERS
 *	p_madw
@@ -535,8 +515,7 @@ osm_madw_construct(
 *
 * SYNOPSIS
 */
-void osm_madw_destroy(
-	IN osm_madw_t* const p_madw );
+void osm_madw_destroy(IN osm_madw_t * const p_madw);
 /*
 * PARAMETERS
 *	p_madw
@@ -565,20 +544,20 @@ void osm_madw_destroy(
 * SYNOPSIS
 */
 static inline void
-osm_madw_init(
-	IN osm_madw_t* const p_madw,
-	IN osm_bind_handle_t h_bind,
-	IN const uint32_t mad_size,
-	IN const osm_mad_addr_t* const p_mad_addr )
+osm_madw_init(IN osm_madw_t * const p_madw,
+	      IN osm_bind_handle_t h_bind,
+	      IN const uint32_t mad_size,
+	      IN const osm_mad_addr_t * const p_mad_addr)
 {
-	osm_madw_construct( p_madw );
+	osm_madw_construct(p_madw);
 	p_madw->h_bind = h_bind;
 	p_madw->fail_msg = CL_DISP_MSGID_NONE;
 	p_madw->mad_size = mad_size;
-	if( p_mad_addr )
+	if (p_mad_addr)
 		p_madw->mad_addr = *p_mad_addr;
 	p_madw->resp_expected = FALSE;
 }
+
 /*
 * PARAMETERS
 *	p_madw
@@ -608,12 +587,11 @@ osm_madw_init(
 *
 * SYNOPSIS
 */
-static inline ib_smp_t*
-osm_madw_get_smp_ptr(
-	IN const osm_madw_t* const p_madw )
+static inline ib_smp_t *osm_madw_get_smp_ptr(IN const osm_madw_t * const p_madw)
 {
-	return( (ib_smp_t*)p_madw->p_mad );
+	return ((ib_smp_t *) p_madw->p_mad);
 }
+
 /*
 * PARAMETERS
 *	p_madw
@@ -637,12 +615,12 @@ osm_madw_get_smp_ptr(
 *
 * SYNOPSIS
 */
-static inline ib_sa_mad_t*
-osm_madw_get_sa_mad_ptr(
-	IN const osm_madw_t* const p_madw )
+static inline ib_sa_mad_t *osm_madw_get_sa_mad_ptr(IN const osm_madw_t *
+						   const p_madw)
 {
-	return( (ib_sa_mad_t*)p_madw->p_mad );
+	return ((ib_sa_mad_t *) p_madw->p_mad);
 }
+
 /*
 * PARAMETERS
 *	p_madw
@@ -663,12 +641,12 @@ osm_madw_get_sa_mad_ptr(
 *
 * SYNOPSIS
 */
-static inline ib_perfmgt_mad_t*
-osm_madw_get_perfmgt_mad_ptr(
-	IN const osm_madw_t* const p_madw )
+static inline ib_perfmgt_mad_t *osm_madw_get_perfmgt_mad_ptr(IN const osm_madw_t
+							     * const p_madw)
 {
-	return((ib_perfmgt_mad_t*)p_madw->p_mad);
+	return ((ib_perfmgt_mad_t *) p_madw->p_mad);
 }
+
 /*
 * PARAMETERS
 *	p_madw
@@ -692,12 +670,12 @@ osm_madw_get_perfmgt_mad_ptr(
 *
 * SYNOPSIS
 */
-static inline osm_ni_context_t*
-osm_madw_get_ni_context_ptr(
-	IN const osm_madw_t* const p_madw )
+static inline osm_ni_context_t *osm_madw_get_ni_context_ptr(IN const osm_madw_t
+							    * const p_madw)
 {
-	return( (osm_ni_context_t*)&p_madw->context );
+	return ((osm_ni_context_t *) & p_madw->context);
 }
+
 /*
 * PARAMETERS
 *	p_madw
@@ -720,12 +698,12 @@ osm_madw_get_ni_context_ptr(
 *
 * SYNOPSIS
 */
-static inline osm_pi_context_t*
-osm_madw_get_pi_context_ptr(
-	IN const osm_madw_t* const p_madw )
+static inline osm_pi_context_t *osm_madw_get_pi_context_ptr(IN const osm_madw_t
+							    * const p_madw)
 {
-	return( (osm_pi_context_t*)&p_madw->context );
+	return ((osm_pi_context_t *) & p_madw->context);
 }
+
 /*
 * PARAMETERS
 *	p_madw
@@ -748,12 +726,12 @@ osm_madw_get_pi_context_ptr(
 *
 * SYNOPSIS
 */
-static inline osm_nd_context_t*
-osm_madw_get_nd_context_ptr(
-	IN const osm_madw_t* const p_madw )
+static inline osm_nd_context_t *osm_madw_get_nd_context_ptr(IN const osm_madw_t
+							    * const p_madw)
 {
-	return( (osm_nd_context_t*)&p_madw->context );
+	return ((osm_nd_context_t *) & p_madw->context);
 }
+
 /*
 * PARAMETERS
 *	p_madw
@@ -776,12 +754,13 @@ osm_madw_get_nd_context_ptr(
 *
 * SYNOPSIS
 */
-static inline osm_lft_context_t*
-osm_madw_get_lft_context_ptr(
-	IN const osm_madw_t* const p_madw )
+static inline osm_lft_context_t *osm_madw_get_lft_context_ptr(IN const
+							      osm_madw_t *
+							      const p_madw)
 {
-	return( (osm_lft_context_t*)&p_madw->context );
+	return ((osm_lft_context_t *) & p_madw->context);
 }
+
 /*
 * PARAMETERS
 *	p_madw
@@ -804,12 +783,13 @@ osm_madw_get_lft_context_ptr(
 *
 * SYNOPSIS
 */
-static inline osm_mft_context_t*
-osm_madw_get_mft_context_ptr(
-	IN const osm_madw_t* const p_madw )
+static inline osm_mft_context_t *osm_madw_get_mft_context_ptr(IN const
+							      osm_madw_t *
+							      const p_madw)
 {
-	return( (osm_mft_context_t*)&p_madw->context );
+	return ((osm_mft_context_t *) & p_madw->context);
 }
+
 /*
 * PARAMETERS
 *	p_madw
@@ -832,12 +812,12 @@ osm_madw_get_mft_context_ptr(
 *
 * SYNOPSIS
 */
-static inline osm_si_context_t*
-osm_madw_get_si_context_ptr(
-	IN const osm_madw_t* const p_madw )
+static inline osm_si_context_t *osm_madw_get_si_context_ptr(IN const osm_madw_t
+							    * const p_madw)
 {
-	return( (osm_si_context_t*)&p_madw->context );
+	return ((osm_si_context_t *) & p_madw->context);
 }
+
 /*
 * PARAMETERS
 *	p_madw
@@ -860,12 +840,13 @@ osm_madw_get_si_context_ptr(
 *
 * SYNOPSIS
 */
-static inline osm_smi_context_t*
-osm_madw_get_smi_context_ptr(
-	IN const osm_madw_t* const p_madw )
+static inline osm_smi_context_t *osm_madw_get_smi_context_ptr(IN const
+							      osm_madw_t *
+							      const p_madw)
 {
-	return( (osm_smi_context_t*)&p_madw->context );
+	return ((osm_smi_context_t *) & p_madw->context);
 }
+
 /*
 * PARAMETERS
 *	p_madw
@@ -888,12 +869,13 @@ osm_madw_get_smi_context_ptr(
 *
 * SYNOPSIS
 */
-static inline osm_pkey_context_t*
-osm_madw_get_pkey_context_ptr(
-	IN const osm_madw_t* const p_madw )
+static inline osm_pkey_context_t *osm_madw_get_pkey_context_ptr(IN const
+								osm_madw_t *
+								const p_madw)
 {
-	return( (osm_pkey_context_t*)&p_madw->context );
+	return ((osm_pkey_context_t *) & p_madw->context);
 }
+
 /*
 * PARAMETERS
 *	p_madw
@@ -916,12 +898,13 @@ osm_madw_get_pkey_context_ptr(
 *
 * SYNOPSIS
 */
-static inline osm_slvl_context_t*
-osm_madw_get_slvl_context_ptr(
-	IN const osm_madw_t* const p_madw )
+static inline osm_slvl_context_t *osm_madw_get_slvl_context_ptr(IN const
+								osm_madw_t *
+								const p_madw)
 {
-	return( (osm_slvl_context_t*)&p_madw->context );
+	return ((osm_slvl_context_t *) & p_madw->context);
 }
+
 /*
 * PARAMETERS
 *	p_madw
@@ -944,12 +927,13 @@ osm_madw_get_slvl_context_ptr(
 *
 * SYNOPSIS
 */
-static inline osm_vla_context_t*
-osm_madw_get_vla_context_ptr(
-	IN const osm_madw_t* const p_madw )
+static inline osm_vla_context_t *osm_madw_get_vla_context_ptr(IN const
+							      osm_madw_t *
+							      const p_madw)
 {
-	return( (osm_vla_context_t*)&p_madw->context );
+	return ((osm_vla_context_t *) & p_madw->context);
 }
+
 /*
 * PARAMETERS
 *	p_madw
@@ -973,12 +957,16 @@ osm_madw_get_vla_context_ptr(
 *
 * SYNOPSIS
 */
-static inline osm_arbitrary_context_t*
-osm_madw_get_arbitrary_context_ptr(
-	IN const osm_madw_t* const p_madw )
+static inline osm_arbitrary_context_t *osm_madw_get_arbitrary_context_ptr(IN
+									  const
+									  osm_madw_t
+									  *
+									  const
+									  p_madw)
 {
-	return( (osm_arbitrary_context_t*)&p_madw->context );
+	return ((osm_arbitrary_context_t *) & p_madw->context);
 }
+
 /*
 * PARAMETERS
 *	p_madw
@@ -1002,12 +990,12 @@ osm_madw_get_arbitrary_context_ptr(
 *
 * SYNOPSIS
 */
-static inline osm_vend_wrap_t*
-osm_madw_get_vend_ptr(
-	IN const osm_madw_t* const p_madw )
+static inline osm_vend_wrap_t *osm_madw_get_vend_ptr(IN const osm_madw_t *
+						     const p_madw)
 {
-	return( (osm_vend_wrap_t*)&p_madw->vend_wrap );
+	return ((osm_vend_wrap_t *) & p_madw->vend_wrap);
 }
+
 /*
 * PARAMETERS
 *	p_madw
@@ -1031,11 +1019,11 @@ osm_madw_get_vend_ptr(
 * SYNOPSIS
 */
 static inline osm_bind_handle_t
-osm_madw_get_bind_handle(
-	IN const osm_madw_t* const p_madw )
+osm_madw_get_bind_handle(IN const osm_madw_t * const p_madw)
 {
-	return( (osm_bind_handle_t)p_madw->h_bind );
+	return ((osm_bind_handle_t) p_madw->h_bind);
 }
+
 /*
 * PARAMETERS
 *	p_madw
@@ -1058,12 +1046,12 @@ osm_madw_get_bind_handle(
 *
 * SYNOPSIS
 */
-static inline osm_mad_addr_t*
-osm_madw_get_mad_addr_ptr(
-	IN const osm_madw_t* const p_madw )
+static inline osm_mad_addr_t *osm_madw_get_mad_addr_ptr(IN const osm_madw_t *
+							const p_madw)
 {
-	return( (osm_mad_addr_t*)&p_madw->mad_addr );
+	return ((osm_mad_addr_t *) & p_madw->mad_addr);
 }
+
 /*
 * PARAMETERS
 *	p_madw
@@ -1086,12 +1074,11 @@ osm_madw_get_mad_addr_ptr(
 *
 * SYNOPSIS
 */
-static inline ib_mad_t*
-osm_madw_get_mad_ptr(
-	IN const osm_madw_t* const p_madw )
+static inline ib_mad_t *osm_madw_get_mad_ptr(IN const osm_madw_t * const p_madw)
 {
-	return( (ib_mad_t*)p_madw->p_mad );
+	return ((ib_mad_t *) p_madw->p_mad);
 }
+
 /*
 * PARAMETERS
 *	p_madw
@@ -1116,11 +1103,11 @@ osm_madw_get_mad_ptr(
 * SYNOPSIS
 */
 static inline cl_disp_msgid_t
-osm_madw_get_err_msg(
-	IN const osm_madw_t* const p_madw )
+osm_madw_get_err_msg(IN const osm_madw_t * const p_madw)
 {
-	return( (cl_disp_msgid_t)p_madw->fail_msg );
+	return ((cl_disp_msgid_t) p_madw->fail_msg);
 }
+
 /*
 * PARAMETERS
 *	p_madw
@@ -1145,12 +1132,11 @@ osm_madw_get_err_msg(
 * SYNOPSIS
 */
 static inline void
-osm_madw_set_mad(
-	IN osm_madw_t* const p_madw,
-	IN const ib_mad_t* const p_mad )
+osm_madw_set_mad(IN osm_madw_t * const p_madw, IN const ib_mad_t * const p_mad)
 {
 	p_madw->p_mad = p_mad;
 }
+
 /*
 * PARAMETERS
 *	p_madw
@@ -1177,12 +1163,12 @@ osm_madw_set_mad(
 * SYNOPSIS
 */
 static inline void
-osm_madw_copy_context(
-	IN osm_madw_t* const p_dest,
-	IN const osm_madw_t* const p_src )
+osm_madw_copy_context(IN osm_madw_t * const p_dest,
+		      IN const osm_madw_t * const p_src)
 {
 	p_dest->context = p_src->context;
 }
+
 /*
 * PARAMETERS
 *	p_dest
@@ -1200,5 +1186,4 @@ osm_madw_copy_context(
 *********/
 
 END_C_DECLS
-
-#endif		/* _OSM_MADW_H_ */
+#endif				/* _OSM_MADW_H_ */
diff --git a/opensm/include/opensm/osm_mcast_fwd_rcv.h b/opensm/include/opensm/osm_mcast_fwd_rcv.h
index 3a2de28..9d81ee6 100644
--- a/opensm/include/opensm/osm_mcast_fwd_rcv.h
+++ b/opensm/include/opensm/osm_mcast_fwd_rcv.h
@@ -57,13 +57,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/MFT Receiver
 * NAME
 *	MFT Receiver
@@ -81,7 +80,6 @@ BEGIN_C_DECLS
 *	Steve King, Intel
 *
 *********/
-
 /****s* OpenSM: MFT Receiver/osm_mft_rcv_t
 * NAME
 *	osm_mft_rcv_t
@@ -94,11 +92,10 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_mft_rcv
-{
-	osm_subn_t	*p_subn;
-	osm_log_t	*p_log;
-	cl_plock_t	*p_lock;
+typedef struct _osm_mft_rcv {
+	osm_subn_t *p_subn;
+	osm_log_t *p_log;
+	cl_plock_t *p_lock;
 } osm_mft_rcv_t;
 /*
 * FIELDS
@@ -124,9 +121,7 @@ typedef struct _osm_mft_rcv
 *
 * SYNOPSIS
 */
-void
-osm_mft_rcv_construct(
-	IN osm_mft_rcv_t* const p_rcv );
+void osm_mft_rcv_construct(IN osm_mft_rcv_t * const p_rcv);
 /*
 * PARAMETERS
 *	p_rcv
@@ -156,9 +151,7 @@ osm_mft_rcv_construct(
 *
 * SYNOPSIS
 */
-void
-osm_mft_rcv_destroy(
-	IN osm_mft_rcv_t* const p_rcv );
+void osm_mft_rcv_destroy(IN osm_mft_rcv_t * const p_rcv);
 /*
 * PARAMETERS
 *	p_rcv
@@ -190,11 +183,9 @@ osm_mft_rcv_destroy(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_mft_rcv_init(
-	IN osm_mft_rcv_t* const p_rcv,
-	IN osm_subn_t* const p_subn,
-	IN osm_log_t* const p_log,
-	IN cl_plock_t* const p_lock );
+osm_mft_rcv_init(IN osm_mft_rcv_t * const p_rcv,
+		 IN osm_subn_t * const p_subn,
+		 IN osm_log_t * const p_log, IN cl_plock_t * const p_lock);
 /*
 * PARAMETERS
 *	p_rcv
@@ -230,10 +221,7 @@ osm_mft_rcv_init(
 *
 * SYNOPSIS
 */
-void
-osm_mft_rcv_process(
-	IN void *context,
-	IN void *data );
+void osm_mft_rcv_process(IN void *context, IN void *data);
 /*
 * PARAMETERS
 *	context
@@ -254,5 +242,4 @@ osm_mft_rcv_process(
 *********/
 
 END_C_DECLS
-
-#endif	/* _OSM_MFT_RCV_H_ */
+#endif				/* _OSM_MFT_RCV_H_ */
diff --git a/opensm/include/opensm/osm_mcast_mgr.h b/opensm/include/opensm/osm_mcast_mgr.h
index 462c841..3e0b761 100644
--- a/opensm/include/opensm/osm_mcast_mgr.h
+++ b/opensm/include/opensm/osm_mcast_mgr.h
@@ -59,15 +59,13 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 #define OSM_MCAST_MGR_LIST_SIZE_MIN 256
-
 /****h* OpenSM/Multicast Manager
 * NAME
 *	Multicast Manager
@@ -85,7 +83,6 @@ BEGIN_C_DECLS
 *	Steve King, Intel
 *
 *********/
-
 /****s* OpenSM: Multicast Manager/osm_mcast_mgr_t
 * NAME
 *	osm_mcast_mgr_t
@@ -98,12 +95,11 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_mcast_mgr
-{
-	osm_subn_t					*p_subn;
-	osm_req_t					*p_req;
-	osm_log_t					*p_log;
-	cl_plock_t					*p_lock;
+typedef struct _osm_mcast_mgr {
+	osm_subn_t *p_subn;
+	osm_req_t *p_req;
+	osm_log_t *p_log;
+	cl_plock_t *p_lock;
 
 } osm_mcast_mgr_t;
 /*
@@ -133,9 +129,7 @@ typedef struct _osm_mcast_mgr
 *
 * SYNOPSIS
 */
-void
-osm_mcast_mgr_construct(
-	IN osm_mcast_mgr_t* const p_mgr );
+void osm_mcast_mgr_construct(IN osm_mcast_mgr_t * const p_mgr);
 /*
 * PARAMETERS
 *	p_mgr
@@ -165,9 +159,7 @@ osm_mcast_mgr_construct(
 *
 * SYNOPSIS
 */
-void
-osm_mcast_mgr_destroy(
-	IN osm_mcast_mgr_t* const p_mgr );
+void osm_mcast_mgr_destroy(IN osm_mcast_mgr_t * const p_mgr);
 /*
 * PARAMETERS
 *	p_mgr
@@ -199,12 +191,10 @@ osm_mcast_mgr_destroy(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_mcast_mgr_init(
-	IN osm_mcast_mgr_t* const p_mgr,
-	IN osm_req_t* const p_req,
-	IN osm_subn_t* const p_subn,
-	IN osm_log_t* const p_log,
-	IN cl_plock_t* const p_lock );
+osm_mcast_mgr_init(IN osm_mcast_mgr_t * const p_mgr,
+		   IN osm_req_t * const p_req,
+		   IN osm_subn_t * const p_subn,
+		   IN osm_log_t * const p_log, IN cl_plock_t * const p_lock);
 /*
 * PARAMETERS
 *	p_mgr
@@ -243,9 +233,7 @@ osm_mcast_mgr_init(
 *
 * SYNOPSIS
 */
-osm_signal_t
-osm_mcast_mgr_process(
-	IN osm_mcast_mgr_t* const p_mgr );
+osm_signal_t osm_mcast_mgr_process(IN osm_mcast_mgr_t * const p_mgr);
 /*
 * PARAMETERS
 *	p_mgr
@@ -275,9 +263,7 @@ osm_mcast_mgr_process(
 * SYNOPSIS
 */
 osm_signal_t
-osm_mcast_mgr_process_mgrp_cb(
-	IN void*					const Context1,
-	IN void*					const Context2 );
+osm_mcast_mgr_process_mgrp_cb(IN void *const Context1, IN void *const Context2);
 /*
 * PARAMETERS
 *	(Context1) p_mgr
@@ -306,11 +292,10 @@ osm_mcast_mgr_process_mgrp_cb(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_mcast_mgr_process_single(
-	IN osm_mcast_mgr_t* const p_mgr,
-	IN const ib_net16_t mlid,
-	IN const ib_net64_t port_guid,
-	IN const uint8_t join_state );
+osm_mcast_mgr_process_single(IN osm_mcast_mgr_t * const p_mgr,
+			     IN const ib_net16_t mlid,
+			     IN const ib_net64_t port_guid,
+			     IN const uint8_t join_state);
 /*
 * PARAMETERS
 *	p_mgr
@@ -335,5 +320,4 @@ osm_mcast_mgr_process_single(
 *********/
 
 END_C_DECLS
-
-#endif	/* _OSM_MCAST_MGR_H_ */
+#endif				/* _OSM_MCAST_MGR_H_ */
diff --git a/opensm/include/opensm/osm_mcast_tbl.h b/opensm/include/opensm/osm_mcast_tbl.h
index ca609ae..46a41ec 100644
--- a/opensm/include/opensm/osm_mcast_tbl.h
+++ b/opensm/include/opensm/osm_mcast_tbl.h
@@ -55,13 +55,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****s* OpenSM: Forwarding Table/osm_mcast_tbl_t
 * NAME
 *	osm_mcast_tbl_t
@@ -73,15 +72,14 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_mcast_fwd_tbl
-{
-	uint8_t				num_ports;
-	uint8_t				max_position;
-	uint16_t			max_block;
-	int16_t				max_block_in_use;
-	uint16_t			num_entries;
-	uint16_t			max_mlid_ho;
-	uint16_t			(*p_mask_tbl)[][IB_MCAST_POSITION_MAX];
+typedef struct _osm_mcast_fwd_tbl {
+	uint8_t num_ports;
+	uint8_t max_position;
+	uint16_t max_block;
+	int16_t max_block_in_use;
+	uint16_t num_entries;
+	uint16_t max_mlid_ho;
+	uint16_t(*p_mask_tbl)[][IB_MCAST_POSITION_MAX];
 } osm_mcast_tbl_t;
 /*
 * FIELDS
@@ -122,10 +120,8 @@ typedef struct _osm_mcast_fwd_tbl
 * SYNOPSIS
 */
 ib_api_status_t
-osm_mcast_tbl_init(
-	IN osm_mcast_tbl_t* const p_tbl,
-	IN uint8_t const num_ports,
-	IN uint16_t const capacity );
+osm_mcast_tbl_init(IN osm_mcast_tbl_t * const p_tbl,
+		   IN uint8_t const num_ports, IN uint16_t const capacity);
 /*
 * PARAMETERS
 *	num_ports
@@ -152,9 +148,7 @@ osm_mcast_tbl_init(
 *
 * SYNOPSIS
 */
-void
-osm_mcast_tbl_delete(
-	IN osm_mcast_tbl_t** const pp_tbl );
+void osm_mcast_tbl_delete(IN osm_mcast_tbl_t ** const pp_tbl);
 /*
 * PARAMETERS
 *	pp_tbl
@@ -179,9 +173,7 @@ osm_mcast_tbl_delete(
 *
 * SYNOPSIS
 */
-void
-osm_mcast_tbl_destroy(
-  IN osm_mcast_tbl_t* const p_tbl );
+void osm_mcast_tbl_destroy(IN osm_mcast_tbl_t * const p_tbl);
 /*
 * PARAMETERS
 *	p_tbl
@@ -205,10 +197,8 @@ osm_mcast_tbl_destroy(
 * SYNOPSIS
 */
 void
-osm_mcast_tbl_set(
-	IN osm_mcast_tbl_t* const p_tbl,
-	IN const uint16_t mlid_ho,
-	IN const uint8_t port_num );
+osm_mcast_tbl_set(IN osm_mcast_tbl_t * const p_tbl,
+		  IN const uint16_t mlid_ho, IN const uint8_t port_num);
 /*
 * PARAMETERS
 *	p_tbl
@@ -238,9 +228,8 @@ osm_mcast_tbl_set(
 * SYNOPSIS
 */
 void
-osm_mcast_tbl_clear_mlid(
-	IN osm_mcast_tbl_t* const p_tbl,
-	IN const uint16_t mlid_ho );
+osm_mcast_tbl_clear_mlid(IN osm_mcast_tbl_t * const p_tbl,
+			 IN const uint16_t mlid_ho);
 /*
 * PARAMETERS
 *	p_tbl
@@ -267,10 +256,8 @@ osm_mcast_tbl_clear_mlid(
 * SYNOPSIS
 */
 boolean_t
-osm_mcast_tbl_is_port(
-	IN const osm_mcast_tbl_t* const p_tbl,
-	IN const uint16_t mlid_ho,
-	IN const uint8_t port_num );
+osm_mcast_tbl_is_port(IN const osm_mcast_tbl_t * const p_tbl,
+		      IN const uint16_t mlid_ho, IN const uint8_t port_num);
 /*
 * PARAMETERS
 *	p_tbl
@@ -300,9 +287,8 @@ osm_mcast_tbl_is_port(
 * SYNOPSIS
 */
 boolean_t
-osm_mcast_tbl_is_any_port(
-	IN const osm_mcast_tbl_t* const p_tbl,
-	IN const uint16_t mlid_ho );
+osm_mcast_tbl_is_any_port(IN const osm_mcast_tbl_t * const p_tbl,
+			  IN const uint16_t mlid_ho);
 /*
 * PARAMETERS
 *	p_tbl
@@ -329,11 +315,9 @@ osm_mcast_tbl_is_any_port(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_mcast_tbl_set_block(
-	IN osm_mcast_tbl_t* const p_tbl,
-	IN const ib_net16_t* const p_block,
-	IN const int16_t block_num,
-	IN const uint8_t position );
+osm_mcast_tbl_set_block(IN osm_mcast_tbl_t * const p_tbl,
+			IN const ib_net16_t * const p_block,
+			IN const int16_t block_num, IN const uint8_t position);
 /*
 * PARAMETERS
 *	p_tbl
@@ -363,11 +347,10 @@ osm_mcast_tbl_set_block(
 * SYNOPSIS
 */
 boolean_t
-osm_mcast_tbl_get_block(
-	IN osm_mcast_tbl_t* const p_tbl,
-	IN const int16_t block_num,
-	IN const uint8_t position,
-	OUT ib_net16_t* const p_block );
+osm_mcast_tbl_get_block(IN osm_mcast_tbl_t * const p_tbl,
+			IN const int16_t block_num,
+			IN const uint8_t position,
+			OUT ib_net16_t * const p_block);
 /*
 * PARAMETERS
 *	p_tbl
@@ -403,11 +386,11 @@ osm_mcast_tbl_get_block(
 * SYNOPSIS
 */
 static inline uint16_t
-osm_mcast_tbl_get_max_block(
-	IN osm_mcast_tbl_t* const p_tbl )
+osm_mcast_tbl_get_max_block(IN osm_mcast_tbl_t * const p_tbl)
 {
-	return( p_tbl->max_block );
+	return (p_tbl->max_block);
 }
+
 /*
 * PARAMETERS
 *	p_tbl
@@ -432,11 +415,11 @@ osm_mcast_tbl_get_max_block(
 * SYNOPSIS
 */
 static inline int16_t
-osm_mcast_tbl_get_max_block_in_use(
-	IN osm_mcast_tbl_t* const p_tbl )
+osm_mcast_tbl_get_max_block_in_use(IN osm_mcast_tbl_t * const p_tbl)
 {
-	return( p_tbl->max_block_in_use );
+	return (p_tbl->max_block_in_use);
 }
+
 /*
 * PARAMETERS
 *	p_tbl
@@ -461,11 +444,11 @@ osm_mcast_tbl_get_max_block_in_use(
 * SYNOPSIS
 */
 static inline uint8_t
-osm_mcast_tbl_get_max_position(
-	IN osm_mcast_tbl_t* const p_tbl )
+osm_mcast_tbl_get_max_position(IN osm_mcast_tbl_t * const p_tbl)
 {
-	return( p_tbl->max_position );
+	return (p_tbl->max_position);
 }
+
 /*
 * PARAMETERS
 *	p_tbl
@@ -480,5 +463,4 @@ osm_mcast_tbl_get_max_position(
 *********/
 
 END_C_DECLS
-
-#endif		/* _OSM_MCAST_TBL_H_ */
+#endif				/* _OSM_MCAST_TBL_H_ */
diff --git a/opensm/include/opensm/osm_mcm_info.h b/opensm/include/opensm/osm_mcm_info.h
index 4b09f0c..202839d 100644
--- a/opensm/include/opensm/osm_mcm_info.h
+++ b/opensm/include/opensm/osm_mcm_info.h
@@ -56,13 +56,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****s* OpenSM: Multicast Member Info/osm_mcm_info_t
 * NAME
 *	osm_mcm_info_t
@@ -77,10 +76,9 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_mcm_info
-{
-	cl_list_item_t	list_item;
-	ib_net16_t	mlid;
+typedef struct _osm_mcm_info {
+	cl_list_item_t list_item;
+	ib_net16_t mlid;
 } osm_mcm_info_t;
 /*
 * FIELDS
@@ -102,9 +100,7 @@ typedef struct _osm_mcm_info
 *
 * SYNOPSIS
 */
-osm_mcm_info_t*
-osm_mcm_info_new(
-  IN const ib_net16_t mlid );
+osm_mcm_info_t *osm_mcm_info_new(IN const ib_net16_t mlid);
 /*
 * PARAMETERS
 *	mlid
@@ -127,9 +123,7 @@ osm_mcm_info_new(
 *
 * SYNOPSIS
 */
-void
-osm_mcm_info_delete(
-	IN osm_mcm_info_t* const p_mcm );
+void osm_mcm_info_delete(IN osm_mcm_info_t * const p_mcm);
 /*
 * PARAMETERS
 *	p_mcm
@@ -144,5 +138,4 @@ osm_mcm_info_delete(
 *********/
 
 END_C_DECLS
-
-#endif		/* _OSM_MCM_INFO_H_ */
+#endif				/* _OSM_MCM_INFO_H_ */
diff --git a/opensm/include/opensm/osm_mcm_port.h b/opensm/include/opensm/osm_mcm_port.h
index 354c65e..da3ca15 100644
--- a/opensm/include/opensm/osm_mcm_port.h
+++ b/opensm/include/opensm/osm_mcm_port.h
@@ -55,13 +55,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****s* OpenSM: MCM Port Object/osm_mcm_port_t
 * NAME
 *   osm_mcm_port_t
@@ -75,12 +74,11 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_mcm_port
-{
-	cl_map_item_t	map_item;
-	ib_gid_t	port_gid;
-	uint8_t		scope_state;
-	boolean_t	proxy_join;
+typedef struct _osm_mcm_port {
+	cl_map_item_t map_item;
+	ib_gid_t port_gid;
+	uint8_t scope_state;
+	boolean_t proxy_join;
 } osm_mcm_port_t;
 /*
 * FIELDS
@@ -113,11 +111,9 @@ typedef struct _osm_mcm_port
 *
 * SYNOPSIS
 */
-osm_mcm_port_t*
-osm_mcm_port_new(
-	IN const ib_gid_t* const p_port_gid,
-	IN const uint8_t   scope_state,
-	IN const boolean_t proxy_join );
+osm_mcm_port_t *osm_mcm_port_new(IN const ib_gid_t * const p_port_gid,
+				 IN const uint8_t scope_state,
+				 IN const boolean_t proxy_join);
 /*
 * PARAMETERS
 *	p_port_gid
@@ -148,9 +144,7 @@ osm_mcm_port_new(
 *
 * SYNOPSIS
 */
-void
-osm_mcm_port_delete(
-	IN osm_mcm_port_t* const p_mcm );
+void osm_mcm_port_delete(IN osm_mcm_port_t * const p_mcm);
 /*
 * PARAMETERS
 *	p_mcm
@@ -166,5 +160,4 @@ osm_mcm_port_delete(
 *********/
 
 END_C_DECLS
-
-#endif		/* _OSM_MCM_PORT_H_ */
+#endif				/* _OSM_MCM_PORT_H_ */
diff --git a/opensm/include/opensm/osm_msgdef.h b/opensm/include/opensm/osm_msgdef.h
index f6ec8f8..c4e1714 100644
--- a/opensm/include/opensm/osm_msgdef.h
+++ b/opensm/include/opensm/osm_msgdef.h
@@ -49,13 +49,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/Dispatcher Messages
 * NAME
 *	Dispatcher Messages
@@ -76,7 +75,6 @@ BEGIN_C_DECLS
 *	Steve King, Intel
 *
 *********/
-
 /****s* OpenSM: Dispatcher Messages/OSM_MSG_MAD_NODE_INFO
 * NAME
 *	OSM_MSG_MAD_NODE_INFO
@@ -91,7 +89,6 @@ BEGIN_C_DECLS
 *
 *
 ***********/
-
 /****s* OpenSM: Dispatcher Messages/OSM_MSG_MAD_PORT_INFO
 * NAME
 *	OSM_MSG_MAD_PORT_INFO
@@ -106,7 +103,6 @@ BEGIN_C_DECLS
 *
 *
 ***********/
-
 /****s* OpenSM: Dispatcher Messages/OSM_MSG_MAD_SWITCH_INFO
 * NAME
 *	OSM_MSG_MAD_SWITCH_INFO
@@ -120,7 +116,6 @@ BEGIN_C_DECLS
 *	Delivery notice:		yes
 *
 ***********/
-
 /****s* OpenSM: Dispatcher Messages/OSM_MSG_MAD_NODE_DESC
 * NAME
 *	OSM_MSG_MAD_NODE_DESC
@@ -135,7 +130,6 @@ BEGIN_C_DECLS
 *
 * SOURCE
 ***********/
-
 /****d* OpenSM: Dispatcher Messages/OSM_MSG_NO_SMPS_OUTSTANDING
 * NAME
 *   OSM_MSG_NO_SMPS_OUTSTANDING
@@ -150,8 +144,7 @@ BEGIN_C_DECLS
 *
 * SOURCE
 ***********/
-enum
-{
+enum {
 	OSM_MSG_NONE = 0,
 	OSM_MSG_MAD_NODE_INFO,
 	OSM_MSG_MAD_PORT_INFO,
@@ -191,5 +184,4 @@ enum
 };
 
 END_C_DECLS
-
-#endif /* _OSM_MSGDEF_H_ */
+#endif				/* _OSM_MSGDEF_H_ */
diff --git a/opensm/include/opensm/osm_mtree.h b/opensm/include/opensm/osm_mtree.h
index 4b6e669..d1d719e 100644
--- a/opensm/include/opensm/osm_mtree.h
+++ b/opensm/include/opensm/osm_mtree.h
@@ -57,15 +57,13 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 #define OSM_MTREE_LEAF ((void*)-1)
-
 /****h* OpenSM/Multicast Tree
 * NAME
 *	Multicast Tree
@@ -88,7 +86,6 @@ BEGIN_C_DECLS
 *	Steve King, Intel
 *
 *********/
-
 /****s* OpenSM: Multicast Tree/osm_mtree_node_t
 * NAME
 *	osm_mtree_node_t
@@ -105,13 +102,12 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_mtree_node
-{
-	cl_map_item_t		map_item;
-	osm_switch_t		*p_sw;
-	uint8_t			max_children;
-	struct _osm_mtree_node	*p_up;
-	struct _osm_mtree_node	*child_array[1];
+typedef struct _osm_mtree_node {
+	cl_map_item_t map_item;
+	osm_switch_t *p_sw;
+	uint8_t max_children;
+	struct _osm_mtree_node *p_up;
+	struct _osm_mtree_node *child_array[1];
 } osm_mtree_node_t;
 /*
 * FIELDS
@@ -147,9 +143,7 @@ typedef struct _osm_mtree_node
 *
 * SYNOPSIS
 */
-osm_mtree_node_t*
-osm_mtree_node_new(
-	IN const osm_switch_t* const p_sw );
+osm_mtree_node_t *osm_mtree_node_new(IN const osm_switch_t * const p_sw);
 /*
 * PARAMETERS
 *	p_sw
@@ -172,9 +166,7 @@ osm_mtree_node_new(
 *
 * SYNOPSIS
 */
-void
-osm_mtree_destroy(
-  IN osm_mtree_node_t *p_mtn );
+void osm_mtree_destroy(IN osm_mtree_node_t * p_mtn);
 /*
 * PARAMETERS
 *	p_mtn
@@ -201,11 +193,11 @@ osm_mtree_destroy(
 * SYNOPSIS
 */
 static inline uint8_t
-osm_mtree_node_get_max_children(
-	IN const osm_mtree_node_t* const p_mtn )
+osm_mtree_node_get_max_children(IN const osm_mtree_node_t * const p_mtn)
 {
-	return( p_mtn->max_children );
+	return (p_mtn->max_children);
 }
+
 /*
 * PARAMETERS
 *	p_mtn
@@ -228,14 +220,15 @@ osm_mtree_node_get_max_children(
 *
 * SYNOPSIS
 */
-static inline osm_mtree_node_t*
-osm_mtree_node_get_child(
-	IN const osm_mtree_node_t* const p_mtn,
-	IN const uint8_t child )
+static inline osm_mtree_node_t *osm_mtree_node_get_child(IN const
+							 osm_mtree_node_t *
+							 const p_mtn,
+							 IN const uint8_t child)
 {
-	CL_ASSERT( child < p_mtn->max_children );
-	return( p_mtn->child_array[child] );
+	CL_ASSERT(child < p_mtn->max_children);
+	return (p_mtn->child_array[child]);
 }
+
 /*
 * PARAMETERS
 *	p_mtn
@@ -262,12 +255,13 @@ osm_mtree_node_get_child(
 *
 * SYNOPSIS
 */
-static inline osm_switch_t*
-osm_mtree_node_get_switch_ptr(
-	IN const osm_mtree_node_t* const p_mtn )
+static inline osm_switch_t *osm_mtree_node_get_switch_ptr(IN const
+							  osm_mtree_node_t *
+							  const p_mtn)
 {
-	return( p_mtn->p_sw );
+	return (p_mtn->p_sw);
 }
+
 /*
 * PARAMETERS
 *	p_mtn
@@ -286,5 +280,4 @@ osm_mtree_node_get_switch_ptr(
 *********/
 
 END_C_DECLS
-
-#endif		/* _OSM_MTREE_H_ */
+#endif				/* _OSM_MTREE_H_ */
diff --git a/opensm/include/opensm/osm_multicast.h b/opensm/include/opensm/osm_multicast.h
index 79a6e5a..729a2ea 100644
--- a/opensm/include/opensm/osm_multicast.h
+++ b/opensm/include/opensm/osm_multicast.h
@@ -60,13 +60,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/Multicast Group
 * NAME
 *	Multicast Group
@@ -86,7 +85,6 @@ BEGIN_C_DECLS
 *	Steve King, Intel
 *
 *********/
-
 /****f* IBA Base: OpneSM: Multicast Group/osm_get_mcast_req_type_str
 * NAME
 *	osm_get_mcast_req_type_str
@@ -96,9 +94,7 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-const char*
-osm_get_mcast_req_type_str(
-  IN osm_mcast_req_type_t  req_type );
+const char *osm_get_mcast_req_type_str(IN osm_mcast_req_type_t req_type);
 /*
 * PARAMETERS
 *	req_type
@@ -124,11 +120,10 @@ osm_get_mcast_req_type_str(
 *
 * SYNOPSIS
 */
-typedef struct osm_mcast_mgr_ctxt
-{
-	ib_net16_t		mlid;
-	osm_mcast_req_type_t	req_type;
-	ib_net64_t		port_guid;
+typedef struct osm_mcast_mgr_ctxt {
+	ib_net16_t mlid;
+	osm_mcast_req_type_t req_type;
+	ib_net64_t port_guid;
 } osm_mcast_mgr_ctxt_t;
 /*
 * FIELDS
@@ -159,17 +154,16 @@ typedef struct osm_mcast_mgr_ctxt
 *
 * SYNOPSIS
 */
-typedef struct _osm_mgrp
-{
-	cl_map_item_t		map_item;
-	ib_net16_t		mlid;
-	osm_mtree_node_t	*p_root;
-	cl_qmap_t		mcm_port_tbl;
-	ib_member_rec_t		mcmember_rec;
-	boolean_t		well_known;
-	boolean_t		to_be_deleted;
-	uint32_t		last_change_id;
-	uint32_t		last_tree_id;
+typedef struct _osm_mgrp {
+	cl_map_item_t map_item;
+	ib_net16_t mlid;
+	osm_mtree_node_t *p_root;
+	cl_qmap_t mcm_port_tbl;
+	ib_member_rec_t mcmember_rec;
+	boolean_t well_known;
+	boolean_t to_be_deleted;
+	uint32_t last_change_id;
+	uint32_t last_tree_id;
 } osm_mgrp_t;
 /*
 * FIELDS
@@ -223,10 +217,9 @@ typedef struct _osm_mgrp
 *
 * SYNOPSIS
 */
-typedef	void (*osm_mgrp_func_t)(
-	IN const osm_mgrp_t* const p_mgrp,
-	IN const osm_mtree_node_t* const p_mtn,
-	IN void* context );
+typedef void (*osm_mgrp_func_t) (IN const osm_mgrp_t * const p_mgrp,
+				 IN const osm_mtree_node_t * const p_mtn,
+				 IN void *context);
 /*
 * PARAMETERS
 *	p_mgrp
@@ -255,9 +248,7 @@ typedef	void (*osm_mgrp_func_t)(
 *
 * SYNOPSIS
 */
-osm_mgrp_t*
-osm_mgrp_new(
-	IN const ib_net16_t mlid );
+osm_mgrp_t *osm_mgrp_new(IN const ib_net16_t mlid);
 /*
 * PARAMETERS
 *	mlid
@@ -282,9 +273,7 @@ osm_mgrp_new(
 *
 * SYNOPSIS
 */
-void
-osm_mgrp_delete(
-	IN osm_mgrp_t* const p_mgrp );
+void osm_mgrp_delete(IN osm_mgrp_t * const p_mgrp);
 /*
 * PARAMETERS
 *	p_mgrp
@@ -309,13 +298,13 @@ osm_mgrp_delete(
 * SYNOPSIS
 */
 static inline boolean_t
-osm_mgrp_is_guid(
-	IN const osm_mgrp_t* const p_mgrp,
-	IN const ib_net64_t port_guid )
+osm_mgrp_is_guid(IN const osm_mgrp_t * const p_mgrp,
+		 IN const ib_net64_t port_guid)
 {
-	return( cl_qmap_get( &p_mgrp->mcm_port_tbl, port_guid ) !=
-			cl_qmap_end( &p_mgrp->mcm_port_tbl ) );
+	return (cl_qmap_get(&p_mgrp->mcm_port_tbl, port_guid) !=
+		cl_qmap_end(&p_mgrp->mcm_port_tbl));
 }
+
 /*
 * PARAMETERS
 *	p_mgrp
@@ -343,12 +332,11 @@ osm_mgrp_is_guid(
 *
 * SYNOPSIS
 */
-static inline boolean_t
-osm_mgrp_is_empty(
-	IN const osm_mgrp_t* const p_mgrp )
+static inline boolean_t osm_mgrp_is_empty(IN const osm_mgrp_t * const p_mgrp)
 {
-	return( cl_qmap_count( &p_mgrp->mcm_port_tbl ) == 0 );
+	return (cl_qmap_count(&p_mgrp->mcm_port_tbl) == 0);
 }
+
 /*
 * PARAMETERS
 *	p_mgrp
@@ -373,12 +361,11 @@ osm_mgrp_is_empty(
 *
 * SYNOPSIS
 */
-static inline ib_net16_t
-osm_mgrp_get_mlid(
-	IN const osm_mgrp_t* const p_mgrp )
+static inline ib_net16_t osm_mgrp_get_mlid(IN const osm_mgrp_t * const p_mgrp)
 {
-	return( p_mgrp->mlid );
+	return (p_mgrp->mlid);
 }
+
 /*
 * PARAMETERS
 *	p_mgrp
@@ -402,12 +389,10 @@ osm_mgrp_get_mlid(
 *
 * SYNOPSIS
 */
-osm_mcm_port_t*
-osm_mgrp_add_port(
-	IN osm_mgrp_t* const p_mgrp,
-	IN const ib_gid_t* const p_port_gid,
-	IN const uint8_t join_state,
-   IN boolean_t     proxy_join);
+osm_mcm_port_t *osm_mgrp_add_port(IN osm_mgrp_t * const p_mgrp,
+				  IN const ib_gid_t * const p_port_gid,
+				  IN const uint8_t join_state,
+				  IN boolean_t proxy_join);
 /*
 * PARAMETERS
 *	p_mgrp
@@ -439,10 +424,9 @@ osm_mgrp_add_port(
 */
 
 boolean_t
-osm_mgrp_is_port_present(
-	IN const osm_mgrp_t* const p_mgrp,
-	IN const ib_net64_t port_guid,
-	OUT osm_mcm_port_t ** const pp_mcm_port);
+osm_mgrp_is_port_present(IN const osm_mgrp_t * const p_mgrp,
+			 IN const ib_net64_t port_guid,
+			 OUT osm_mcm_port_t ** const pp_mcm_port);
 /*
 * PARAMETERS
 *	p_mgrp
@@ -474,11 +458,10 @@ osm_mgrp_is_port_present(
 * SYNOPSIS
 */
 void
-osm_mgrp_remove_port(
-	IN osm_subn_t* const p_subn,
-	IN osm_log_t* const p_log,
-	IN osm_mgrp_t* const p_mgrp,
-	IN const ib_net64_t port_guid );
+osm_mgrp_remove_port(IN osm_subn_t * const p_subn,
+		     IN osm_log_t * const p_log,
+		     IN osm_mgrp_t * const p_mgrp,
+		     IN const ib_net64_t port_guid);
 /*
 * PARAMETERS
 *
@@ -512,15 +495,15 @@ osm_mgrp_remove_port(
 *
 * SYNOPSIS
 */
-static inline osm_switch_t*
-osm_mgrp_get_root_switch(
-	IN const osm_mgrp_t* const p_mgrp )
+static inline osm_switch_t *osm_mgrp_get_root_switch(IN const osm_mgrp_t *
+						     const p_mgrp)
 {
-	if( p_mgrp->p_root )
-		return( p_mgrp->p_root->p_sw );
+	if (p_mgrp->p_root)
+		return (p_mgrp->p_root->p_sw);
 	else
-		return( NULL );
+		return (NULL);
 }
+
 /*
 * PARAMETERS
 *	p_mgrp
@@ -547,9 +530,8 @@ osm_mgrp_get_root_switch(
 * SYNOPSIS
 */
 float
-osm_mgrp_compute_avg_hops(
-	const osm_mgrp_t* const p_mgrp,
-	const osm_switch_t* const p_sw );
+osm_mgrp_compute_avg_hops(const osm_mgrp_t * const p_mgrp,
+			  const osm_switch_t * const p_sw);
 /*
 * PARAMETERS
 *	p_mgrp
@@ -579,10 +561,8 @@ osm_mgrp_compute_avg_hops(
 * SYNOPSIS
 */
 void
-osm_mgrp_apply_func(
-	const osm_mgrp_t* const p_mgrp,
-	osm_mgrp_func_t p_func,
-	void* context );
+osm_mgrp_apply_func(const osm_mgrp_t * const p_mgrp,
+		    osm_mgrp_func_t p_func, void *context);
 /*
 * PARAMETERS
 *	p_mgrp
@@ -614,10 +594,8 @@ osm_mgrp_apply_func(
 * SYNOPSIS
 */
 void
-osm_mgrp_send_delete_notice(
-	IN osm_subn_t* const p_subn,
-   IN osm_log_t* const p_log,
-   IN osm_mgrp_t *p_mgrp );
+osm_mgrp_send_delete_notice(IN osm_subn_t * const p_subn,
+			    IN osm_log_t * const p_log, IN osm_mgrp_t * p_mgrp);
 /*
 * PARAMETERS
 *	p_subn
@@ -648,10 +626,8 @@ osm_mgrp_send_delete_notice(
 * SYNOPSIS
 */
 void
-osm_mgrp_send_create_notice(
-	IN osm_subn_t* const p_subn,
-   IN osm_log_t* const p_log,
-   IN osm_mgrp_t *p_mgrp );
+osm_mgrp_send_create_notice(IN osm_subn_t * const p_subn,
+			    IN osm_log_t * const p_log, IN osm_mgrp_t * p_mgrp);
 /*
 * PARAMETERS
 *	p_subn
@@ -673,5 +649,4 @@ osm_mgrp_send_create_notice(
 *********/
 
 END_C_DECLS
-
-#endif		/* _OSM_MULTICAST_H_ */
+#endif				/* _OSM_MULTICAST_H_ */
diff --git a/opensm/include/opensm/osm_node.h b/opensm/include/opensm/osm_node.h
index ec4af43..f87e81d 100644
--- a/opensm/include/opensm/osm_node.h
+++ b/opensm/include/opensm/osm_node.h
@@ -58,10 +58,10 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
 
@@ -99,16 +99,15 @@ struct _osm_switch;
 *
 * SYNOPSIS
 */
-typedef struct _osm_node
-{
-	cl_map_item_t	map_item;
+typedef struct _osm_node {
+	cl_map_item_t map_item;
 	struct _osm_switch *sw;
-	ib_node_info_t	node_info;
-	ib_node_desc_t	node_desc;
-	uint32_t	discovery_count;
-	uint32_t	physp_tbl_size;
-	char		print_desc[IB_NODE_DESCRIPTION_SIZE+1];
-	osm_physp_t	physp_table[1];
+	ib_node_info_t node_info;
+	ib_node_desc_t node_desc;
+	uint32_t discovery_count;
+	uint32_t physp_tbl_size;
+	char print_desc[IB_NODE_DESCRIPTION_SIZE + 1];
+	osm_physp_t physp_table[1];
 } osm_node_t;
 /*
 * FIELDS
@@ -159,8 +158,7 @@ typedef struct _osm_node
 *
 * SYNOPSIS
 */
-void osm_node_delete(
-	IN OUT osm_node_t** const p_node );
+void osm_node_delete(IN OUT osm_node_t ** const p_node);
 /*
 * PARAMETERS
 *	p_node
@@ -187,9 +185,7 @@ void osm_node_delete(
 *
 * SYNOPSIS
 */
-osm_node_t*
-osm_node_new(
-	IN const osm_madw_t* const p_madw );
+osm_node_t *osm_node_new(IN const osm_madw_t * const p_madw);
 /*
 * PARAMETERS
 *	p_madw
@@ -217,15 +213,15 @@ osm_node_new(
 *
 * SYNOPSIS
 */
-static inline osm_physp_t*
-osm_node_get_physp_ptr(
-	IN const osm_node_t* const p_node,
-	IN const uint32_t port_num )
+static inline osm_physp_t *osm_node_get_physp_ptr(IN const osm_node_t *
+						  const p_node,
+						  IN const uint32_t port_num)
 {
 
-  CL_ASSERT( port_num < p_node->physp_tbl_size );
-  return( (osm_physp_t*)&p_node->physp_table[port_num] );
+	CL_ASSERT(port_num < p_node->physp_tbl_size);
+	return ((osm_physp_t *) & p_node->physp_table[port_num]);
 }
+
 /*
 * PARAMETERS
 *	p_node
@@ -256,14 +252,15 @@ osm_node_get_physp_ptr(
 *
 * SYNOPSIS
 */
-static inline osm_physp_t*
-osm_node_get_any_physp_ptr(
-	IN const osm_node_t* const p_node )
+static inline osm_physp_t *osm_node_get_any_physp_ptr(IN const osm_node_t *
+						      const p_node)
 {
-	CL_ASSERT( p_node );
-	return( (osm_physp_t*)&p_node->physp_table[
-			ib_node_info_get_local_port_num( &p_node->node_info )] );
+	CL_ASSERT(p_node);
+	return ((osm_physp_t *) & p_node->
+		physp_table[ib_node_info_get_local_port_num
+			    (&p_node->node_info)]);
 }
+
 /*
 * PARAMETERS
 *	p_node
@@ -290,14 +287,16 @@ osm_node_get_any_physp_ptr(
 *
 * SYNOPSIS
 */
-static inline osm_dr_path_t*
-osm_node_get_any_dr_path_ptr(
-	IN const osm_node_t* const p_node )
+static inline osm_dr_path_t *osm_node_get_any_dr_path_ptr(IN const osm_node_t *
+							  const p_node)
 {
-	CL_ASSERT( p_node );
-	return( osm_physp_get_dr_path_ptr( &p_node->physp_table[
-			ib_node_info_get_local_port_num( &p_node->node_info )] ) );
+	CL_ASSERT(p_node);
+	return (osm_physp_get_dr_path_ptr
+		(&p_node->
+		 physp_table[ib_node_info_get_local_port_num
+			     (&p_node->node_info)]));
 }
+
 /*
 * PARAMETERS
 *	p_node
@@ -326,12 +325,11 @@ osm_node_get_any_dr_path_ptr(
 *
 * SYNOPSIS
 */
-static inline uint8_t
-osm_node_get_type(
-	IN const osm_node_t* const p_node )
+static inline uint8_t osm_node_get_type(IN const osm_node_t * const p_node)
 {
-	return( p_node->node_info.node_type );
+	return (p_node->node_info.node_type);
 }
+
 /*
 * PARAMETERS
 *	p_node
@@ -355,12 +353,11 @@ osm_node_get_type(
 *
 * SYNOPSIS
 */
-static inline uint8_t
-osm_node_get_num_physp(
-	IN const osm_node_t* const p_node )
+static inline uint8_t osm_node_get_num_physp(IN const osm_node_t * const p_node)
 {
-	return( (uint8_t)p_node->physp_tbl_size );
+	return ((uint8_t) p_node->physp_tbl_size);
 }
+
 /*
 * PARAMETERS
 *	p_node
@@ -386,11 +383,9 @@ osm_node_get_num_physp(
 *
 * SYNOPSIS
 */
-osm_node_t*
-osm_node_get_remote_node(
-	IN const osm_node_t* const p_node,
-	IN const uint8_t port_num,
-	OUT uint8_t *p_remote_port_num );
+osm_node_t *osm_node_get_remote_node(IN const osm_node_t * const p_node,
+				     IN const uint8_t port_num,
+				     OUT uint8_t * p_remote_port_num);
 /*
 * PARAMETERS
 *	p_node
@@ -425,13 +420,13 @@ osm_node_get_remote_node(
 * SYNOPSIS
 */
 static inline ib_net16_t
-osm_node_get_base_lid(
-	IN const osm_node_t* const p_node,
-	IN const uint32_t port_num )
+osm_node_get_base_lid(IN const osm_node_t * const p_node,
+		      IN const uint32_t port_num)
 {
-	CL_ASSERT( port_num < p_node->physp_tbl_size );
-	return( osm_physp_get_base_lid( &p_node->physp_table[port_num] ) );
+	CL_ASSERT(port_num < p_node->physp_tbl_size);
+	return (osm_physp_get_base_lid(&p_node->physp_table[port_num]));
 }
+
 /*
 * PARAMETERS
 *	p_node
@@ -462,9 +457,8 @@ osm_node_get_base_lid(
 * SYNOPSIS
 */
 ib_net16_t
-osm_node_get_remote_base_lid(
-	IN const osm_node_t* const p_node,
-	IN const uint32_t port_num );
+osm_node_get_remote_base_lid(IN const osm_node_t * const p_node,
+			     IN const uint32_t port_num);
 /*
 * PARAMETERS
 *	p_node
@@ -496,16 +490,16 @@ osm_node_get_remote_base_lid(
 * SYNOPSIS
 */
 static inline uint8_t
-osm_node_get_remote_type(
-	IN const osm_node_t* const p_node,
-	IN const uint8_t port_num )
+osm_node_get_remote_type(IN const osm_node_t * const p_node,
+			 IN const uint8_t port_num)
 {
 	osm_node_t *p_remote_node;
 
-	p_remote_node = osm_node_get_remote_node( p_node, port_num, NULL );
-	CL_ASSERT( p_remote_node );
-	return( osm_node_get_type( p_remote_node ) );
+	p_remote_node = osm_node_get_remote_node(p_node, port_num, NULL);
+	CL_ASSERT(p_remote_node);
+	return (osm_node_get_type(p_remote_node));
 }
+
 /*
 * PARAMETERS
 *	p_node
@@ -534,13 +528,12 @@ osm_node_get_remote_type(
 * SYNOPSIS
 */
 static inline uint8_t
-osm_node_get_lmc(
-	IN const osm_node_t* const p_node,
-	IN const uint32_t port_num )
+osm_node_get_lmc(IN const osm_node_t * const p_node, IN const uint32_t port_num)
 {
-	CL_ASSERT( port_num < p_node->physp_tbl_size );
-	return( osm_physp_get_lmc( &p_node->physp_table[port_num] ) );
+	CL_ASSERT(port_num < p_node->physp_tbl_size);
+	return (osm_physp_get_lmc(&p_node->physp_table[port_num]));
 }
+
 /*
 * PARAMETERS
 *	p_node
@@ -568,9 +561,8 @@ osm_node_get_lmc(
 * SYNOPSIS
 */
 void
-osm_node_init_physp(
-	IN osm_node_t* const p_node,
-	IN const osm_madw_t* const p_madw );
+osm_node_init_physp(IN osm_node_t * const p_node,
+		    IN const osm_madw_t * const p_madw);
 /*
 * PARAMETERS
 *	p_node
@@ -601,11 +593,11 @@ osm_node_init_physp(
 * SYNOPSIS
 */
 static inline ib_net64_t
-osm_node_get_node_guid(
-	IN const osm_node_t* const p_node )
+osm_node_get_node_guid(IN const osm_node_t * const p_node)
 {
-	return( p_node->node_info.node_guid );
+	return (p_node->node_info.node_guid);
 }
+
 /*
 * PARAMETERS
 *	p_node
@@ -630,11 +622,10 @@ osm_node_get_node_guid(
 * SYNOPSIS
 */
 void
-osm_node_link(
-	IN osm_node_t* const p_node,
-	IN const uint8_t port_num,
-	IN osm_node_t* const p_remote_node,
-	IN const uint8_t remote_port_num );
+osm_node_link(IN osm_node_t * const p_node,
+	      IN const uint8_t port_num,
+	      IN osm_node_t * const p_remote_node,
+	      IN const uint8_t remote_port_num);
 /*
 * PARAMETERS
 *	p_node
@@ -670,11 +661,10 @@ osm_node_link(
 * SYNOPSIS
 */
 void
-osm_node_unlink(
-	IN osm_node_t* const p_node,
-	IN const uint8_t port_num,
-	IN osm_node_t* const p_remote_node,
-	IN const uint8_t remote_port_num );
+osm_node_unlink(IN osm_node_t * const p_node,
+		IN const uint8_t port_num,
+		IN osm_node_t * const p_remote_node,
+		IN const uint8_t remote_port_num);
 /*
 * PARAMETERS
 *	p_node
@@ -710,11 +700,10 @@ osm_node_unlink(
 * SYNOPSIS
 */
 boolean_t
-osm_node_link_exists(
-	IN osm_node_t* const p_node,
-	IN const uint8_t port_num,
-	IN osm_node_t* const p_remote_node,
-	IN const uint8_t remote_port_num );
+osm_node_link_exists(IN osm_node_t * const p_node,
+		     IN const uint8_t port_num,
+		     IN osm_node_t * const p_remote_node,
+		     IN const uint8_t remote_port_num);
 /*
 * PARAMETERS
 *	p_node
@@ -753,9 +742,7 @@ osm_node_link_exists(
 * SYNOPSIS
 */
 boolean_t
-osm_node_has_any_link(
-	IN osm_node_t* const p_node,
-	IN const uint8_t port_num );
+osm_node_has_any_link(IN osm_node_t * const p_node, IN const uint8_t port_num);
 /*
 * PARAMETERS
 *	p_node
@@ -786,11 +773,10 @@ osm_node_has_any_link(
 * SYNOPSIS
 */
 boolean_t
-osm_node_link_has_valid_ports(
-	IN osm_node_t* const p_node,
-	IN const uint8_t port_num,
-	IN osm_node_t* const p_remote_node,
-	IN const uint8_t remote_port_num );
+osm_node_link_has_valid_ports(IN osm_node_t * const p_node,
+			      IN const uint8_t port_num,
+			      IN osm_node_t * const p_remote_node,
+			      IN const uint8_t remote_port_num);
 /*
 * PARAMETERS
 *	p_node
@@ -810,5 +796,4 @@ osm_node_link_has_valid_ports(
 *********/
 
 END_C_DECLS
-
-#endif	/* _OSM_NODE_H_ */
+#endif				/* _OSM_NODE_H_ */
diff --git a/opensm/include/opensm/osm_node_desc_rcv.h b/opensm/include/opensm/osm_node_desc_rcv.h
index b228d58..fc336d7 100644
--- a/opensm/include/opensm/osm_node_desc_rcv.h
+++ b/opensm/include/opensm/osm_node_desc_rcv.h
@@ -58,13 +58,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/Node Description Receiver
 * NAME
 *	Node Description Receiver
@@ -82,7 +81,6 @@ BEGIN_C_DECLS
 *	Steve King, Intel
 *
 *********/
-
 /****s* OpenSM: Node Description Receiver/osm_nd_rcv_t
 * NAME
 *	osm_nd_rcv_t
@@ -95,11 +93,10 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_nd_rcv
-{
-	osm_subn_t	*p_subn;
-	osm_log_t	*p_log;
-	cl_plock_t	*p_lock;
+typedef struct _osm_nd_rcv {
+	osm_subn_t *p_subn;
+	osm_log_t *p_log;
+	cl_plock_t *p_lock;
 } osm_nd_rcv_t;
 /*
 * FIELDS
@@ -125,8 +122,7 @@ typedef struct _osm_nd_rcv
 *
 * SYNOPSIS
 */
-void osm_nd_rcv_construct(
-	IN osm_nd_rcv_t* const p_rcv );
+void osm_nd_rcv_construct(IN osm_nd_rcv_t * const p_rcv);
 /*
 * PARAMETERS
 *	p_rcv
@@ -156,8 +152,7 @@ void osm_nd_rcv_construct(
 *
 * SYNOPSIS
 */
-void osm_nd_rcv_destroy(
-	IN osm_nd_rcv_t* const p_rcv );
+void osm_nd_rcv_destroy(IN osm_nd_rcv_t * const p_rcv);
 /*
 * PARAMETERS
 *	p_rcv
@@ -188,11 +183,10 @@ void osm_nd_rcv_destroy(
 *
 * SYNOPSIS
 */
-ib_api_status_t osm_nd_rcv_init(
-	IN osm_nd_rcv_t* const p_rcv,
-	IN osm_subn_t* const p_subn,
-	IN osm_log_t* const p_log,
-	IN cl_plock_t* const p_lock );
+ib_api_status_t osm_nd_rcv_init(IN osm_nd_rcv_t * const p_rcv,
+				IN osm_subn_t * const p_subn,
+				IN osm_log_t * const p_log,
+				IN cl_plock_t * const p_lock);
 /*
 * PARAMETERS
 *	p_rcv
@@ -228,9 +222,7 @@ ib_api_status_t osm_nd_rcv_init(
 *
 * SYNOPSIS
 */
-void osm_nd_rcv_process(
-	IN void *context,
-	IN void *data );
+void osm_nd_rcv_process(IN void *context, IN void *data);
 /*
 * PARAMETERS
 *	context
@@ -251,5 +243,4 @@ void osm_nd_rcv_process(
 *********/
 
 END_C_DECLS
-
-#endif	/* _OSM_ND_RCV_H_ */
+#endif				/* _OSM_ND_RCV_H_ */
diff --git a/opensm/include/opensm/osm_node_info_rcv.h b/opensm/include/opensm/osm_node_info_rcv.h
index 790b57b..31b89ac 100644
--- a/opensm/include/opensm/osm_node_info_rcv.h
+++ b/opensm/include/opensm/osm_node_info_rcv.h
@@ -61,13 +61,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/Node Info Receiver
 * NAME
 *	Node Info Receiver
@@ -85,7 +84,6 @@ BEGIN_C_DECLS
 *	Steve King, Intel
 *
 *********/
-
 /****s* OpenSM: Node Info Receiver/osm_ni_rcv_t
 * NAME
 *	osm_ni_rcv_t
@@ -98,13 +96,12 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_ni_rcv
-{
-	osm_subn_t	*p_subn;
-	osm_req_t	*p_gen_req;
-	osm_log_t	*p_log;
-	osm_state_mgr_t	*p_state_mgr;
-	cl_plock_t	*p_lock;
+typedef struct _osm_ni_rcv {
+	osm_subn_t *p_subn;
+	osm_req_t *p_gen_req;
+	osm_log_t *p_log;
+	osm_state_mgr_t *p_state_mgr;
+	cl_plock_t *p_lock;
 } osm_ni_rcv_t;
 /*
 * FIELDS
@@ -136,8 +133,7 @@ typedef struct _osm_ni_rcv
 *
 * SYNOPSIS
 */
-void osm_ni_rcv_construct(
-	IN osm_ni_rcv_t* const p_ctrl );
+void osm_ni_rcv_construct(IN osm_ni_rcv_t * const p_ctrl);
 /*
 * PARAMETERS
 *	p_ctrl
@@ -168,8 +164,7 @@ void osm_ni_rcv_construct(
 *
 * SYNOPSIS
 */
-void osm_ni_rcv_destroy(
-	IN osm_ni_rcv_t* const p_ctrl );
+void osm_ni_rcv_destroy(IN osm_ni_rcv_t * const p_ctrl);
 /*
 * PARAMETERS
 *	p_ctrl
@@ -200,13 +195,12 @@ void osm_ni_rcv_destroy(
 *
 * SYNOPSIS
 */
-ib_api_status_t osm_ni_rcv_init(
-	IN osm_ni_rcv_t* const p_ctrl,
-	IN osm_req_t* const p_req,
-	IN osm_subn_t* const p_subn,
-	IN osm_log_t* const p_log,
-	IN osm_state_mgr_t* const p_state_mgr,
-	IN cl_plock_t* const p_lock );
+ib_api_status_t osm_ni_rcv_init(IN osm_ni_rcv_t * const p_ctrl,
+				IN osm_req_t * const p_req,
+				IN osm_subn_t * const p_subn,
+				IN osm_log_t * const p_log,
+				IN osm_state_mgr_t * const p_state_mgr,
+				IN cl_plock_t * const p_lock);
 /*
 * PARAMETERS
 *	p_ctrl
@@ -248,8 +242,7 @@ ib_api_status_t osm_ni_rcv_init(
 *
 * SYNOPSIS
 */
-boolean_t osm_ni_rcv_is_inited(
-	IN const osm_ni_rcv_t* const p_ctrl );
+boolean_t osm_ni_rcv_is_inited(IN const osm_ni_rcv_t * const p_ctrl);
 /*
 * PARAMETERS
 *	p_ctrl
@@ -277,9 +270,7 @@ boolean_t osm_ni_rcv_is_inited(
 *
 * SYNOPSIS
 */
-void osm_ni_rcv_process(
-	IN void *context,
-	IN void *data );
+void osm_ni_rcv_process(IN void *context, IN void *data);
 /*
 * PARAMETERS
 *	context
@@ -300,5 +291,4 @@ void osm_ni_rcv_process(
 *********/
 
 END_C_DECLS
-
-#endif	/* _OSM_NI_RCV_H_ */
+#endif				/* _OSM_NI_RCV_H_ */
diff --git a/opensm/include/opensm/osm_opensm.h b/opensm/include/opensm/osm_opensm.h
index 2d668e9..850e51a 100644
--- a/opensm/include/opensm/osm_opensm.h
+++ b/opensm/include/opensm/osm_opensm.h
@@ -67,13 +67,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/OpenSM
 * NAME
 *	OpenSM
@@ -91,7 +90,6 @@ BEGIN_C_DECLS
 *	Steve King, Intel
 *
 *********/
-
 /****s* OpenSM: OpenSM/osm_routing_engine
 * NAME
 *	struct osm_routing_engine
@@ -105,10 +103,10 @@ BEGIN_C_DECLS
 struct osm_routing_engine {
 	const char *name;
 	void *context;
-	int (*build_lid_matrices)(void *context);
-	int (*ucast_build_fwd_tables)(void *context);
-	void (*ucast_dump_tables)(void *context);
-	void (*delete)(void *context);
+	int (*build_lid_matrices) (void *context);
+	int (*ucast_build_fwd_tables) (void *context);
+	void (*ucast_dump_tables) (void *context);
+	void (*delete) (void *context);
 };
 /*
 * FIELDS
@@ -133,13 +131,12 @@ struct osm_routing_engine {
 *		internals cleanup.
 */
 
-typedef struct _osm_console_t
-{
-  int   socket;
-  int   in_fd;
-  int   out_fd;
-  FILE *in;
-  FILE *out;
+typedef struct _osm_console_t {
+	int socket;
+	int in_fd;
+	int out_fd;
+	FILE *in;
+	FILE *out;
 } osm_console_t;
 
 /****s* OpenSM: OpenSM/osm_opensm_t
@@ -154,25 +151,24 @@ typedef struct _osm_console_t
 *
 * SYNOPSIS
 */
-typedef struct _osm_opensm_t
-{
-  osm_subn_t		subn;
-  osm_sm_t		sm;
-  osm_sa_t		sa;
+typedef struct _osm_opensm_t {
+	osm_subn_t subn;
+	osm_sm_t sm;
+	osm_sa_t sa;
 #ifdef ENABLE_OSM_PERF_MGR
-  osm_perfmgr_t         perfmgr;
-#endif /* ENABLE_OSM_PERF_MGR */
-  osm_epi_plugin_t     *event_plugin;
-  osm_db_t		db;
-  osm_mad_pool_t	mad_pool;
-  osm_vendor_t		*p_vendor;
-  osm_vl15_t		vl15;
-  osm_log_t		log;
-  cl_dispatcher_t	disp;
-  cl_plock_t		lock;
-  struct osm_routing_engine routing_engine;
-  osm_stats_t		stats;
-  osm_console_t		console;
+	osm_perfmgr_t perfmgr;
+#endif				/* ENABLE_OSM_PERF_MGR */
+	osm_epi_plugin_t *event_plugin;
+	osm_db_t db;
+	osm_mad_pool_t mad_pool;
+	osm_vendor_t *p_vendor;
+	osm_vl15_t vl15;
+	osm_log_t log;
+	cl_dispatcher_t disp;
+	cl_plock_t lock;
+	struct osm_routing_engine routing_engine;
+	osm_stats_t stats;
+	osm_console_t console;
 } osm_opensm_t;
 /*
 * FIELDS
@@ -226,8 +222,7 @@ typedef struct _osm_opensm_t
 *
 * SYNOPSIS
 */
-void osm_opensm_construct(
-	IN osm_opensm_t* const p_osm );
+void osm_opensm_construct(IN osm_opensm_t * const p_osm);
 /*
 * PARAMETERS
 *	p_osm
@@ -256,8 +251,7 @@ void osm_opensm_construct(
 *
 * SYNOPSIS
 */
-void osm_opensm_destroy(
-	IN osm_opensm_t* const p_osm );
+void osm_opensm_destroy(IN osm_opensm_t * const p_osm);
 /*
 * PARAMETERS
 *	p_osm
@@ -286,9 +280,8 @@ void osm_opensm_destroy(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_opensm_init(
-	IN osm_opensm_t* const p_osm,
-	IN const osm_subn_opt_t* const p_opt );
+osm_opensm_init(IN osm_opensm_t * const p_osm,
+		IN const osm_subn_opt_t * const p_opt);
 /*
 * PARAMETERS
 *	p_osm
@@ -316,12 +309,11 @@ osm_opensm_init(
 *
 * SYNOPSIS
 */
-static inline void
-osm_opensm_sweep(
-	IN osm_opensm_t* const p_osm )
+static inline void osm_opensm_sweep(IN osm_opensm_t * const p_osm)
 {
-	osm_sm_sweep( &p_osm->sm );
+	osm_sm_sweep(&p_osm->sm);
 }
+
 /*
 * PARAMETERS
 *	p_osm
@@ -348,12 +340,12 @@ osm_opensm_sweep(
 * SYNOPSIS
 */
 static inline void
-osm_opensm_set_log_flags(
-	IN osm_opensm_t* const p_osm,
-	IN const osm_log_level_t log_flags )
+osm_opensm_set_log_flags(IN osm_opensm_t * const p_osm,
+			 IN const osm_log_level_t log_flags)
 {
-	osm_log_set_level( &p_osm->log, log_flags );
+	osm_log_set_level(&p_osm->log, log_flags);
 }
+
 /*
 * PARAMETERS
 *	p_osm
@@ -380,9 +372,7 @@ osm_opensm_set_log_flags(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_opensm_bind(
-	IN osm_opensm_t* const p_osm,
-	IN const ib_net64_t guid );
+osm_opensm_bind(IN osm_opensm_t * const p_osm, IN const ib_net64_t guid);
 /*
 * PARAMETERS
 *	p_osm
@@ -410,13 +400,13 @@ osm_opensm_bind(
 * SYNOPSIS
 */
 static inline cl_status_t
-osm_opensm_wait_for_subnet_up(
-	IN osm_opensm_t*			const p_osm,
-	IN uint32_t				const wait_us,
-	IN boolean_t				const interruptible )
+osm_opensm_wait_for_subnet_up(IN osm_opensm_t * const p_osm,
+			      IN uint32_t const wait_us,
+			      IN boolean_t const interruptible)
 {
-	return( osm_sm_wait_for_subnet_up( &p_osm->sm, wait_us, interruptible ) );
+	return (osm_sm_wait_for_subnet_up(&p_osm->sm, wait_us, interruptible));
 }
+
 /*
 * PARAMETERS
 *	p_osm
@@ -445,8 +435,8 @@ osm_opensm_wait_for_subnet_up(
 *********/
 
 /* dump helpers */
-void osm_dump_mcast_routes(osm_opensm_t *osm);
-void osm_dump_all(osm_opensm_t *osm);
+void osm_dump_mcast_routes(osm_opensm_t * osm);
+void osm_dump_all(osm_opensm_t * osm);
 
 /****v* OpenSM/osm_exit_flag
 */
@@ -457,5 +447,4 @@ extern volatile unsigned int osm_exit_flag;
 *********/
 
 END_C_DECLS
-
-#endif	/* _OSM_OPENSM_H_ */
+#endif				/* _OSM_OPENSM_H_ */
diff --git a/opensm/include/opensm/osm_partition.h b/opensm/include/opensm/osm_partition.h
index f806719..f00034f 100644
--- a/opensm/include/opensm/osm_partition.h
+++ b/opensm/include/opensm/osm_partition.h
@@ -57,13 +57,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/Partition
 * NAME
 *	Partition
@@ -83,7 +82,6 @@ BEGIN_C_DECLS
 *	Steve King, Intel
 *
 *********/
-
 /****s* OpenSM: Partition/osm_prtn_t
 * NAME
 *	osm_prtn_t
@@ -96,14 +94,13 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_prtn
-{
-	cl_map_item_t	map_item;
-	uint16_t	pkey;
-	uint8_t		sl;
-	cl_map_t	full_guid_tbl;
-	cl_map_t	part_guid_tbl;
-	char		name[32];
+typedef struct _osm_prtn {
+	cl_map_item_t map_item;
+	uint16_t pkey;
+	uint8_t sl;
+	cl_map_t full_guid_tbl;
+	cl_map_t part_guid_tbl;
+	char name[32];
 } osm_prtn_t;
 /*
 * FIELDS
@@ -141,8 +138,7 @@ typedef struct _osm_prtn
 *
 * SYNOPSIS
 */
-void osm_prtn_delete(
-	IN OUT osm_prtn_t** const pp_prtn );
+void osm_prtn_delete(IN OUT osm_prtn_t ** const pp_prtn);
 /*
 * PARAMETERS
 *	pp_prtn
@@ -168,9 +164,7 @@ void osm_prtn_delete(
 *
 * SYNOPSIS
 */
-osm_prtn_t* osm_prtn_new(
-	IN const char *name,
-	IN const uint16_t pkey );
+osm_prtn_t *osm_prtn_new(IN const char *name, IN const uint16_t pkey);
 /*
 * PARAMETERS
 *	name
@@ -198,14 +192,13 @@ osm_prtn_t* osm_prtn_new(
 *
 * SYNOPSIS
 */
-static inline
-boolean_t osm_prtn_is_guid(
-	IN const osm_prtn_t* const p_prtn,
-	IN const ib_net64_t guid )
+static inline boolean_t osm_prtn_is_guid(IN const osm_prtn_t * const p_prtn,
+					 IN const ib_net64_t guid)
 {
 	return (cl_map_get(&p_prtn->full_guid_tbl, guid) != NULL) ||
-		(cl_map_get(&p_prtn->part_guid_tbl, guid) != NULL);
+	    (cl_map_get(&p_prtn->part_guid_tbl, guid) != NULL);
 }
+
 /*
 * PARAMETERS
 *	p_prtn
@@ -232,9 +225,8 @@ boolean_t osm_prtn_is_guid(
 *
 * SYNOPSIS
 */
-ib_api_status_t osm_prtn_make_partitions(
-	IN osm_log_t * const p_log,
-	IN osm_subn_t * const p_subn);
+ib_api_status_t osm_prtn_make_partitions(IN osm_log_t * const p_log,
+					 IN osm_subn_t * const p_subn);
 /*
 * PARAMETERS
 *	p_log
@@ -252,5 +244,4 @@ ib_api_status_t osm_prtn_make_partitions(
 *********/
 
 END_C_DECLS
-
-#endif /* _OSM_PARTITION_H_ */
+#endif				/* _OSM_PARTITION_H_ */
diff --git a/opensm/include/opensm/osm_path.h b/opensm/include/opensm/osm_path.h
index fcc31d9..e26036c 100644
--- a/opensm/include/opensm/osm_path.h
+++ b/opensm/include/opensm/osm_path.h
@@ -43,13 +43,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /*
  * Abstract:
  * 	Declaration of path related objects.
@@ -60,7 +59,6 @@ BEGIN_C_DECLS
  *
  * $Revision: 1.4 $
  */
-
 /****h* OpenSM/DR Path
 * NAME
 *	DR Path
@@ -74,7 +72,6 @@ BEGIN_C_DECLS
 *	Steve King, Intel
 *
 *********/
-
 /****s* OpenSM: DR Path/osm_dr_path_t
 * NAME
 *	osm_dr_path_t
@@ -86,11 +83,10 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_dr_path
-{
-	osm_bind_handle_t		h_bind;
-	uint8_t					hop_count;
-	uint8_t					path[IB_SUBNET_PATH_HOPS_MAX];
+typedef struct _osm_dr_path {
+	osm_bind_handle_t h_bind;
+	uint8_t hop_count;
+	uint8_t path[IB_SUBNET_PATH_HOPS_MAX];
 
 } osm_dr_path_t;
 /*
@@ -116,12 +112,10 @@ typedef struct _osm_dr_path
 *
 * SYNOPSIS
 */
-static inline void
-osm_dr_path_construct(
-	IN osm_dr_path_t* const p_path )
+static inline void osm_dr_path_construct(IN osm_dr_path_t * const p_path)
 {
 	/* The first location in the path array is reserved. */
-	memset( p_path, 0, sizeof(*p_path) );
+	memset(p_path, 0, sizeof(*p_path));
 	p_path->h_bind = OSM_BIND_INVALID_HANDLE;
 }
 
@@ -157,18 +151,17 @@ osm_dr_path_construct(
 * SYNOPSIS
 */
 static inline void
-osm_dr_path_init(
-	IN osm_dr_path_t* const p_path,
-	IN const osm_bind_handle_t h_bind,
-	IN const uint8_t hop_count,
-	IN const uint8_t path[IB_SUBNET_PATH_HOPS_MAX] )
+osm_dr_path_init(IN osm_dr_path_t * const p_path,
+		 IN const osm_bind_handle_t h_bind,
+		 IN const uint8_t hop_count,
+		 IN const uint8_t path[IB_SUBNET_PATH_HOPS_MAX])
 {
 	/* The first location in the path array is reserved. */
-	CL_ASSERT( path[0] == 0 );
-	CL_ASSERT( hop_count < IB_SUBNET_PATH_HOPS_MAX );
+	CL_ASSERT(path[0] == 0);
+	CL_ASSERT(hop_count < IB_SUBNET_PATH_HOPS_MAX);
 	p_path->h_bind = h_bind;
 	p_path->hop_count = hop_count;
-	memcpy( p_path->path, path, IB_SUBNET_PATH_HOPS_MAX );
+	memcpy(p_path->path, path, IB_SUBNET_PATH_HOPS_MAX);
 }
 
 /*
@@ -202,15 +195,13 @@ osm_dr_path_init(
 * SYNOPSIS
 */
 static inline void
-osm_dr_path_extend(
-	IN osm_dr_path_t* const p_path,
-	IN const uint8_t port_num )
+osm_dr_path_extend(IN osm_dr_path_t * const p_path, IN const uint8_t port_num)
 {
 	p_path->hop_count++;
-	CL_ASSERT( p_path->hop_count < IB_SUBNET_PATH_HOPS_MAX );
+	CL_ASSERT(p_path->hop_count < IB_SUBNET_PATH_HOPS_MAX);
 	/*
-		Location 0 in the path array is reserved per IB spec.
-	*/
+	   Location 0 in the path array is reserved per IB spec.
+	 */
 	p_path->path[p_path->hop_count] = port_num;
 }
 
@@ -240,10 +231,9 @@ osm_dr_path_extend(
 * SYNOPSIS
 */
 static inline osm_bind_handle_t
-osm_dr_path_get_bind_handle(
-	IN const osm_dr_path_t* const p_path )
+osm_dr_path_get_bind_handle(IN const osm_dr_path_t * const p_path)
 {
-	return( p_path->h_bind );
+	return (p_path->h_bind);
 }
 
 /*
@@ -263,5 +253,4 @@ osm_dr_path_get_bind_handle(
 *********/
 
 END_C_DECLS
-
-#endif		/* _OSM_PATH_H_ */
+#endif				/* _OSM_PATH_H_ */
diff --git a/opensm/include/opensm/osm_perfmgr.h b/opensm/include/opensm/osm_perfmgr.h
index 4c26d1c..6f0971b 100644
--- a/opensm/include/opensm/osm_perfmgr.h
+++ b/opensm/include/opensm/osm_perfmgr.h
@@ -37,7 +37,7 @@
 
 #if HAVE_CONFIG_H
 #  include <config.h>
-#endif /* HAVE_CONFIG_H */
+#endif				/* HAVE_CONFIG_H */
 
 #ifdef ENABLE_OSM_PERF_MGR
 
@@ -55,7 +55,7 @@
 
 #ifdef __cplusplus
 extern "C" {
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 /****h* OpenSM/PerfMgr
 * NAME
@@ -76,68 +76,64 @@ extern "C" {
 #define OSM_PERFMGR_DEFAULT_DUMP_FILE OSM_DEFAULT_TMP_DIR "/opensm_port_counters.log"
 #define OSM_PERFMGR_DEFAULT_MAX_OUTSTANDING_QUERIES 500
 
-
 /****s* OpenSM: PerfMgr/osm_perfmgr_state_t */
-typedef enum
-{
-  PERFMGR_STATE_DISABLE,
-  PERFMGR_STATE_ENABLED,
-  PERFMGR_STATE_NO_DB
+typedef enum {
+	PERFMGR_STATE_DISABLE,
+	PERFMGR_STATE_ENABLED,
+	PERFMGR_STATE_NO_DB
 } osm_perfmgr_state_t;
 
 /****s* OpenSM: PerfMgr/osm_perfmgr_sweep_state_t */
-typedef enum
-{
-  PERFMGR_SWEEP_SLEEP,
-  PERFMGR_SWEEP_ACTIVE,
-  PERFMGR_SWEEP_SUSPENDED
+typedef enum {
+	PERFMGR_SWEEP_SLEEP,
+	PERFMGR_SWEEP_ACTIVE,
+	PERFMGR_SWEEP_SUSPENDED
 } osm_perfmgr_sweep_state_t;
 
 /* Redirection information */
 typedef struct redir {
-	ib_net16_t		redir_lid;
-	ib_net32_t		redir_qp;
+	ib_net16_t redir_lid;
+	ib_net32_t redir_qp;
 } redir_t;
 
 /* Node to store information about which nodes we are monitoring */
 typedef struct _monitored_node {
-	cl_map_item_t	        map_item;
+	cl_map_item_t map_item;
 	struct _monitored_node *next;
-	uint64_t                guid;
-	uint32_t		redir_tbl_size;
-	redir_t			redir_port[1];	/* redirection on a per port basis */
+	uint64_t guid;
+	uint32_t redir_tbl_size;
+	redir_t redir_port[1];	/* redirection on a per port basis */
 } __monitored_node_t;
 
 /****s* OpenSM: PerfMgr/osm_perfmgr_t
 *  This object should be treated as opaque and should
 *  be manipulated only through the provided functions.
 */
-typedef struct _osm_perfmgr
-{
-  osm_thread_state_t         thread_state;
-  cl_event_t                 sig_sweep;
-  cl_thread_t                sweeper;
-  osm_subn_t                *subn;
-  osm_sm_t                  *sm;
-  cl_plock_t                *lock;
-  osm_log_t                 *log;
-  osm_mad_pool_t            *mad_pool;
-  atomic32_t                 trans_id;
-  osm_vendor_t              *vendor;
-  osm_bind_handle_t          bind_handle;
-  cl_disp_reg_handle_t       pc_disp_h;
-  osm_perfmgr_state_t        state;
-  osm_perfmgr_sweep_state_t  sweep_state;
-  uint16_t                   sweep_time_s;
-  char                      *db_file;
-  char                      *event_db_dump_file;
-  perfmgr_db_t              *db;
-  atomic32_t                 outstanding_queries; /* this along with sig_query */
-  cl_event_t                 sig_query;           /* will throttle our querys */
-  uint32_t                   max_outstanding_queries;
-  cl_qmap_t                  monitored_map;       /* map the nodes we are tracking */
-  __monitored_node_t        *remove_list;
-  osm_epi_plugin_t          *event_plugin;
+typedef struct _osm_perfmgr {
+	osm_thread_state_t thread_state;
+	cl_event_t sig_sweep;
+	cl_thread_t sweeper;
+	osm_subn_t *subn;
+	osm_sm_t *sm;
+	cl_plock_t *lock;
+	osm_log_t *log;
+	osm_mad_pool_t *mad_pool;
+	atomic32_t trans_id;
+	osm_vendor_t *vendor;
+	osm_bind_handle_t bind_handle;
+	cl_disp_reg_handle_t pc_disp_h;
+	osm_perfmgr_state_t state;
+	osm_perfmgr_sweep_state_t sweep_state;
+	uint16_t sweep_time_s;
+	char *db_file;
+	char *event_db_dump_file;
+	perfmgr_db_t *db;
+	atomic32_t outstanding_queries;	/* this along with sig_query */
+	cl_event_t sig_query;	/* will throttle our querys */
+	uint32_t max_outstanding_queries;
+	cl_qmap_t monitored_map;	/* map the nodes we are tracking */
+	__monitored_node_t *remove_list;
+	osm_epi_plugin_t *event_plugin;
 } osm_perfmgr_t;
 /*
 * FIELDS
@@ -158,78 +154,86 @@ typedef struct _osm_perfmgr
 *********/
 
 /****f* OpenSM: Creation Functions */
-void osm_perfmgr_shutdown(osm_perfmgr_t *const p_perfmgr );
-void osm_perfmgr_destroy(osm_perfmgr_t * const p_perfmgr );
+void osm_perfmgr_shutdown(osm_perfmgr_t * const p_perfmgr);
+void osm_perfmgr_destroy(osm_perfmgr_t * const p_perfmgr);
 
 /****f* OpenSM: Inline accessor functions */
-inline static void osm_perfmgr_set_state(osm_perfmgr_t *p_perfmgr,
+inline static void osm_perfmgr_set_state(osm_perfmgr_t * p_perfmgr,
 					 osm_perfmgr_state_t state)
 {
 	p_perfmgr->state = state;
 	if (state == PERFMGR_STATE_ENABLED)
 		cl_event_signal(&p_perfmgr->sig_sweep);
 }
+
 inline static osm_perfmgr_state_t osm_perfmgr_get_state(osm_perfmgr_t
-		*p_perfmgr) { return (p_perfmgr->state); }
-inline static char *osm_perfmgr_get_state_str(osm_perfmgr_t *p_perfmgr)
+							  * p_perfmgr)
+{
+	return (p_perfmgr->state);
+}
+
+inline static char *osm_perfmgr_get_state_str(osm_perfmgr_t * p_perfmgr)
 {
-	switch (p_perfmgr->state)
-	{
-		case PERFMGR_STATE_DISABLE:
-			return ("Disabled");
-			break;
-		case PERFMGR_STATE_ENABLED:
-			return ("Enabled");
-			break;
-		case PERFMGR_STATE_NO_DB:
-			return ("No Database");
-			break;
+	switch (p_perfmgr->state) {
+	case PERFMGR_STATE_DISABLE:
+		return ("Disabled");
+		break;
+	case PERFMGR_STATE_ENABLED:
+		return ("Enabled");
+		break;
+	case PERFMGR_STATE_NO_DB:
+		return ("No Database");
+		break;
 	}
 	return ("UNKNOWN");
 }
-inline static char *osm_perfmgr_get_sweep_state_str(osm_perfmgr_t *perfmgr)
+
+inline static char *osm_perfmgr_get_sweep_state_str(osm_perfmgr_t * perfmgr)
 {
-	switch (perfmgr->sweep_state)
-	{
-		case PERFMGR_SWEEP_SLEEP:
-			return ("Sleeping");
-			break;
-		case PERFMGR_SWEEP_ACTIVE:
-			return ("Active");
-			break;
-		case PERFMGR_SWEEP_SUSPENDED:
-			return ("Suspended");
-			break;
+	switch (perfmgr->sweep_state) {
+	case PERFMGR_SWEEP_SLEEP:
+		return ("Sleeping");
+		break;
+	case PERFMGR_SWEEP_ACTIVE:
+		return ("Active");
+		break;
+	case PERFMGR_SWEEP_SUSPENDED:
+		return ("Suspended");
+		break;
 	}
 	return ("UNKNOWN");
 }
-inline static void osm_perfmgr_set_sweep_time_s(osm_perfmgr_t *p_perfmgr, uint16_t time_s)
+
+inline static void osm_perfmgr_set_sweep_time_s(osm_perfmgr_t * p_perfmgr,
+						uint16_t time_s)
 {
 	p_perfmgr->sweep_time_s = time_s;
 	cl_event_signal(&p_perfmgr->sig_sweep);
 }
-inline static uint16_t osm_perfmgr_get_sweep_time_s(osm_perfmgr_t *p_perfmgr)
+
+inline static uint16_t osm_perfmgr_get_sweep_time_s(osm_perfmgr_t * p_perfmgr)
 {
 	return (p_perfmgr->sweep_time_s);
 }
-void osm_perfmgr_clear_counters(osm_perfmgr_t *p_perfmgr);
-void osm_perfmgr_dump_counters(osm_perfmgr_t *p_perfmgr, perfmgr_db_dump_t dump_type);
 
-ib_api_status_t osm_perfmgr_bind(osm_perfmgr_t * const p_perfmgr, const ib_net64_t port_guid);
+void osm_perfmgr_clear_counters(osm_perfmgr_t * p_perfmgr);
+void osm_perfmgr_dump_counters(osm_perfmgr_t * p_perfmgr,
+			       perfmgr_db_dump_t dump_type);
+
+ib_api_status_t osm_perfmgr_bind(osm_perfmgr_t * const p_perfmgr,
+				 const ib_net64_t port_guid);
 
 /****f* OpenSM: PerfMgr/osm_perfmgr_init */
-ib_api_status_t
-osm_perfmgr_init(
-	osm_perfmgr_t* const perfmgr,
-	osm_subn_t* const subn,
-	osm_sm_t * const sm,
-	osm_log_t* const log,
-	osm_mad_pool_t * const mad_pool,
-	osm_vendor_t * const vendor,
-	cl_dispatcher_t* const disp,
-	cl_plock_t* const lock,
-	const osm_subn_opt_t * const p_opt,
-	osm_epi_plugin_t     *event_plugin);
+ib_api_status_t osm_perfmgr_init(osm_perfmgr_t * const perfmgr,
+				 osm_subn_t * const subn,
+				 osm_sm_t * const sm,
+				 osm_log_t * const log,
+				 osm_mad_pool_t * const mad_pool,
+				 osm_vendor_t * const vendor,
+				 cl_dispatcher_t * const disp,
+				 cl_plock_t * const lock,
+				 const osm_subn_opt_t * const p_opt,
+				 osm_epi_plugin_t * event_plugin);
 /*
 * PARAMETERS
 *	perfmgr
@@ -268,8 +272,8 @@ osm_perfmgr_init(
 
 #ifdef __cplusplus
 }
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
-#endif /* ENABLE_OSM_PERF_MGR */
+#endif				/* ENABLE_OSM_PERF_MGR */
 
-#endif /* _OSM_PERFMGR_H_ */
+#endif				/* _OSM_PERFMGR_H_ */
diff --git a/opensm/include/opensm/osm_perfmgr_db.h b/opensm/include/opensm/osm_perfmgr_db.h
index 19ebd72..0991102 100644
--- a/opensm/include/opensm/osm_perfmgr_db.h
+++ b/opensm/include/opensm/osm_perfmgr_db.h
@@ -44,13 +44,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/PerfMgr Event Database
 * DESCRIPTION
 *       Database interface to record subnet events
@@ -61,7 +60,6 @@ BEGIN_C_DECLS
 *	Ira Weiny, LLNL
 *
 *********/
-
 typedef enum {
 	PERFMGR_EVENT_DB_SUCCESS = 0,
 	PERFMGR_EVENT_DB_FAIL,
@@ -75,50 +73,50 @@ typedef enum {
  * Port error reading
  */
 typedef struct {
-	uint64_t   symbol_err_cnt;
-	uint64_t   link_err_recover;
-	uint64_t   link_downed;
-	uint64_t   rcv_err;
-	uint64_t   rcv_rem_phys_err;
-	uint64_t   rcv_switch_relay_err;
-	uint64_t   xmit_discards;
-	uint64_t   xmit_constraint_err;
-	uint64_t   rcv_constraint_err;
-	uint64_t   link_integrity;
-	uint64_t   buffer_overrun;
-	uint64_t   vl15_dropped;
-	time_t     time;
+	uint64_t symbol_err_cnt;
+	uint64_t link_err_recover;
+	uint64_t link_downed;
+	uint64_t rcv_err;
+	uint64_t rcv_rem_phys_err;
+	uint64_t rcv_switch_relay_err;
+	uint64_t xmit_discards;
+	uint64_t xmit_constraint_err;
+	uint64_t rcv_constraint_err;
+	uint64_t link_integrity;
+	uint64_t buffer_overrun;
+	uint64_t vl15_dropped;
+	time_t time;
 } perfmgr_db_err_reading_t;
 
 /** =========================================================================
  * Port data count reading
  */
 typedef struct {
-	uint64_t   xmit_data; /* can be used for std or extended */
-	uint64_t   rcv_data;  /* can be used for std or extended */
-	uint64_t   xmit_pkts; /* can be used for std or extended */
-	uint64_t   rcv_pkts;  /* can be used for std or extended */
-	uint64_t   unicast_xmit_pkts;
-	uint64_t   unicast_rcv_pkts;
-	uint64_t   multicast_xmit_pkts;
-	uint64_t   multicast_rcv_pkts;
-	time_t     time;
+	uint64_t xmit_data;	/* can be used for std or extended */
+	uint64_t rcv_data;	/* can be used for std or extended */
+	uint64_t xmit_pkts;	/* can be used for std or extended */
+	uint64_t rcv_pkts;	/* can be used for std or extended */
+	uint64_t unicast_xmit_pkts;
+	uint64_t unicast_rcv_pkts;
+	uint64_t multicast_xmit_pkts;
+	uint64_t multicast_rcv_pkts;
+	time_t time;
 } perfmgr_db_data_cnt_reading_t;
 
 /** =========================================================================
  * Port select errors
  */
 typedef struct {
-	uint64_t   xmit_wait;
-	time_t     time;
+	uint64_t xmit_wait;
+	time_t time;
 } perfmgr_db_ps_reading_t;
 
 /** =========================================================================
  * Dump output options
  */
 typedef enum {
-	PERFMGR_EVENT_DB_DUMP_HR = 0, /* Human readable */
-	PERFMGR_EVENT_DB_DUMP_MR      /* Machine readable */
+	PERFMGR_EVENT_DB_DUMP_HR = 0,	/* Human readable */
+	PERFMGR_EVENT_DB_DUMP_MR	/* Machine readable */
 } perfmgr_db_dump_t;
 
 /** =========================================================================
@@ -130,7 +128,7 @@ typedef struct _db_port {
 	perfmgr_db_err_reading_t err_previous;
 	perfmgr_db_data_cnt_reading_t dc_total;
 	perfmgr_db_data_cnt_reading_t dc_previous;
-	time_t   last_reset;
+	time_t last_reset;
 } _db_port_t;
 
 /** =========================================================================
@@ -138,66 +136,67 @@ typedef struct _db_port {
  */
 #define NODE_NAME_SIZE (IB_NODE_DESCRIPTION_SIZE << 1)
 typedef struct _db_node {
-	cl_map_item_t   map_item; /* must be first */
-	uint64_t        node_guid;
-	_db_port_t     *ports;
-	uint8_t         num_ports;
-	char            node_name[NODE_NAME_SIZE];
+	cl_map_item_t map_item;	/* must be first */
+	uint64_t node_guid;
+	_db_port_t *ports;
+	uint8_t num_ports;
+	char node_name[NODE_NAME_SIZE];
 } _db_node_t;
 
 /** =========================================================================
  * all nodes in the system.
  */
 typedef struct _db {
-	cl_qmap_t         pc_data; /* stores type (_db_node_t *) */
-	cl_plock_t        lock;
-	osm_log_t        *osm_log;
+	cl_qmap_t pc_data;	/* stores type (_db_node_t *) */
+	cl_plock_t lock;
+	osm_log_t *osm_log;
 	osm_epi_plugin_t *event_plugin;
 } perfmgr_db_t;
 
-
 /**
  * functions
  */
-perfmgr_db_t *perfmgr_db_construct(osm_log_t *p_log,
-				osm_epi_plugin_t *event_plugin);
-void                perfmgr_db_destroy(perfmgr_db_t *db);
-
-perfmgr_db_err_t   perfmgr_db_create_entry(perfmgr_db_t *db, uint64_t guid,
-					uint8_t num_ports, char *node_name);
-
-perfmgr_db_err_t   perfmgr_db_add_err_reading(perfmgr_db_t *db, uint64_t guid,
-					uint8_t port, perfmgr_db_err_reading_t *reading);
-perfmgr_db_err_t   perfmgr_db_get_prev_err(perfmgr_db_t *db,
-					uint64_t guid, uint8_t port,
-					perfmgr_db_err_reading_t *reading);
-perfmgr_db_err_t   perfmgr_db_clear_prev_err(perfmgr_db_t *db, uint64_t guid,
-					uint8_t port);
-
-perfmgr_db_err_t   perfmgr_db_add_dc_reading(perfmgr_db_t *db, uint64_t guid,
-					uint8_t port, perfmgr_db_data_cnt_reading_t *reading);
-perfmgr_db_err_t   perfmgr_db_get_prev_dc(perfmgr_db_t *db,
-					uint64_t guid, uint8_t port,
-					perfmgr_db_data_cnt_reading_t *reading);
-perfmgr_db_err_t   perfmgr_db_clear_prev_dc(perfmgr_db_t *db, uint64_t guid,
-					uint8_t port);
-
-void                perfmgr_db_clear_counters(perfmgr_db_t *db);
-perfmgr_db_err_t   perfmgr_db_dump(perfmgr_db_t *db, char *file,
-					perfmgr_db_dump_t dump_type);
+perfmgr_db_t *perfmgr_db_construct(osm_log_t * p_log,
+				   osm_epi_plugin_t * event_plugin);
+void perfmgr_db_destroy(perfmgr_db_t * db);
+
+perfmgr_db_err_t perfmgr_db_create_entry(perfmgr_db_t * db, uint64_t guid,
+					 uint8_t num_ports, char *node_name);
+
+perfmgr_db_err_t perfmgr_db_add_err_reading(perfmgr_db_t * db, uint64_t guid,
+					    uint8_t port,
+					    perfmgr_db_err_reading_t * reading);
+perfmgr_db_err_t perfmgr_db_get_prev_err(perfmgr_db_t * db, uint64_t guid,
+					 uint8_t port,
+					 perfmgr_db_err_reading_t * reading);
+perfmgr_db_err_t perfmgr_db_clear_prev_err(perfmgr_db_t * db, uint64_t guid,
+					   uint8_t port);
+
+perfmgr_db_err_t perfmgr_db_add_dc_reading(perfmgr_db_t * db, uint64_t guid,
+					   uint8_t port,
+					   perfmgr_db_data_cnt_reading_t *
+					   reading);
+perfmgr_db_err_t perfmgr_db_get_prev_dc(perfmgr_db_t * db, uint64_t guid,
+					uint8_t port,
+					perfmgr_db_data_cnt_reading_t *
+					reading);
+perfmgr_db_err_t perfmgr_db_clear_prev_dc(perfmgr_db_t * db, uint64_t guid,
+					  uint8_t port);
+
+void perfmgr_db_clear_counters(perfmgr_db_t * db);
+perfmgr_db_err_t perfmgr_db_dump(perfmgr_db_t * db, char *file,
+				 perfmgr_db_dump_t dump_type);
 
 /** =========================================================================
  * helper functions to fill in the various db objects from wire objects
  */
 
-void perfmgr_db_fill_err_read(ib_port_counters_t *wire_read,
-				perfmgr_db_err_reading_t *reading);
-void perfmgr_db_fill_data_cnt_read_pc(ib_port_counters_t *wire_read,
-				perfmgr_db_data_cnt_reading_t *reading);
-void perfmgr_db_fill_data_cnt_read_epc(ib_port_counters_ext_t *wire_read,
-				perfmgr_db_data_cnt_reading_t *reading);
+void perfmgr_db_fill_err_read(ib_port_counters_t * wire_read,
+			      perfmgr_db_err_reading_t * reading);
+void perfmgr_db_fill_data_cnt_read_pc(ib_port_counters_t * wire_read,
+				      perfmgr_db_data_cnt_reading_t * reading);
+void perfmgr_db_fill_data_cnt_read_epc(ib_port_counters_ext_t * wire_read,
+				       perfmgr_db_data_cnt_reading_t * reading);
 
 END_C_DECLS
-
-#endif		/* _PERFMGR_PM_DB_H_ */
-
+#endif				/* _PERFMGR_PM_DB_H_ */
diff --git a/opensm/include/opensm/osm_pkey.h b/opensm/include/opensm/osm_pkey.h
index 42c620d..3c84e4b 100644
--- a/opensm/include/opensm/osm_pkey.h
+++ b/opensm/include/opensm/osm_pkey.h
@@ -46,13 +46,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /*
    Forward references.
 */
@@ -86,14 +85,13 @@ struct _osm_physp;
 *
 * SYNOPSIS
 */
-typedef struct _osm_pkey_tbl
-{
-  cl_ptr_vector_t blocks;
-  cl_ptr_vector_t new_blocks;
-  cl_map_t        keys;
-  cl_qlist_t      pending;
-  uint16_t        used_blocks;
-  uint16_t        max_blocks;
+typedef struct _osm_pkey_tbl {
+	cl_ptr_vector_t blocks;
+	cl_ptr_vector_t new_blocks;
+	cl_map_t keys;
+	cl_qlist_t pending;
+	uint16_t used_blocks;
+	uint16_t max_blocks;
 } osm_pkey_tbl_t;
 /*
 * FIELDS
@@ -140,11 +138,11 @@ typedef struct _osm_pkey_tbl
 * SYNOPSIS
 */
 typedef struct _osm_pending_pkey {
-  cl_list_item_t	list_item;
-  uint16_t		pkey;
-  uint16_t		block;
-  uint8_t		index;
-  boolean_t		is_new;
+	cl_list_item_t list_item;
+	uint16_t pkey;
+	uint16_t block;
+	uint8_t index;
+	boolean_t is_new;
 } osm_pending_pkey_t;
 /*
 * FIELDS
@@ -173,8 +171,7 @@ typedef struct _osm_pending_pkey {
 *
 * SYNOPSIS
 */
-void osm_pkey_tbl_construct(
-  IN osm_pkey_tbl_t *p_pkey_tbl);
+void osm_pkey_tbl_construct(IN osm_pkey_tbl_t * p_pkey_tbl);
 /*
 *  p_pkey_tbl
 *     [in] Pointer to osm_pkey_tbl_t object.
@@ -192,9 +189,7 @@ void osm_pkey_tbl_construct(
 *
 * SYNOPSIS
 */
-ib_api_status_t
-osm_pkey_tbl_init(
-  IN osm_pkey_tbl_t *p_pkey_tbl);
+ib_api_status_t osm_pkey_tbl_init(IN osm_pkey_tbl_t * p_pkey_tbl);
 /*
 *  p_pkey_tbl
 *     [in] Pointer to osm_pkey_tbl_t object.
@@ -212,8 +207,7 @@ osm_pkey_tbl_init(
 *
 * SYNOPSIS
 */
-void osm_pkey_tbl_destroy(
-  IN osm_pkey_tbl_t *p_pkey_tbl);
+void osm_pkey_tbl_destroy(IN osm_pkey_tbl_t * p_pkey_tbl);
 /*
 *  p_pkey_tbl
 *     [in] Pointer to osm_pkey_tbl_t object.
@@ -232,11 +226,11 @@ void osm_pkey_tbl_destroy(
 * SYNOPSIS
 */
 static inline uint16_t
-osm_pkey_tbl_get_num_blocks(
-  IN const osm_pkey_tbl_t *p_pkey_tbl )
+osm_pkey_tbl_get_num_blocks(IN const osm_pkey_tbl_t * p_pkey_tbl)
 {
-  return((uint16_t)(cl_ptr_vector_get_size( &p_pkey_tbl->blocks )));
+	return ((uint16_t) (cl_ptr_vector_get_size(&p_pkey_tbl->blocks)));
 }
+
 /*
 *  p_pkey_tbl
 *     [in] Pointer to osm_pkey_tbl_t object.
@@ -257,12 +251,14 @@ osm_pkey_tbl_get_num_blocks(
 *
 * SYNOPSIS
 */
-static inline ib_pkey_table_t *osm_pkey_tbl_block_get(
-  const osm_pkey_tbl_t *p_pkey_tbl, uint16_t block)
+static inline ib_pkey_table_t *osm_pkey_tbl_block_get(const osm_pkey_tbl_t *
+						      p_pkey_tbl,
+						      uint16_t block)
 {
-  return( (block < cl_ptr_vector_get_size(&p_pkey_tbl->blocks)) ?
-          cl_ptr_vector_get(&p_pkey_tbl->blocks, block) : NULL );
+	return ((block < cl_ptr_vector_get_size(&p_pkey_tbl->blocks)) ?
+		cl_ptr_vector_get(&p_pkey_tbl->blocks, block) : NULL);
 };
+
 /*
 *  p_pkey_tbl
 *     [in] Pointer to osm_pkey_tbl_t object.
@@ -286,11 +282,12 @@ static inline ib_pkey_table_t *osm_pkey_tbl_block_get(
 *
 * SYNOPSIS
 */
-static inline ib_pkey_table_t *osm_pkey_tbl_new_block_get(
-  const osm_pkey_tbl_t *p_pkey_tbl, uint16_t block)
+static inline ib_pkey_table_t *osm_pkey_tbl_new_block_get(const osm_pkey_tbl_t *
+							  p_pkey_tbl,
+							  uint16_t block)
 {
-  return (block < cl_ptr_vector_get_size(&p_pkey_tbl->new_blocks)) ?
-          cl_ptr_vector_get(&p_pkey_tbl->new_blocks, block) : NULL;
+	return (block < cl_ptr_vector_get_size(&p_pkey_tbl->new_blocks)) ?
+	    cl_ptr_vector_get(&p_pkey_tbl->new_blocks, block) : NULL;
 };
 
 /****f* OpenSM: osm_pkey_tbl_set_new_entry
@@ -304,11 +301,9 @@ static inline ib_pkey_table_t *osm_pkey_tbl_new_block_get(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_pkey_tbl_set_new_entry(
-	IN osm_pkey_tbl_t *p_pkey_tbl,
-	IN uint16_t        block_idx,
-	IN uint8_t         pkey_idx,
-	IN uint16_t        pkey);
+osm_pkey_tbl_set_new_entry(IN osm_pkey_tbl_t * p_pkey_tbl,
+			   IN uint16_t block_idx,
+			   IN uint8_t pkey_idx, IN uint16_t pkey);
 /*
 * p_pkey_tbl
 *   [in] Pointer to the PKey table
@@ -341,10 +336,9 @@ osm_pkey_tbl_set_new_entry(
 * SYNOPSIS
 */
 boolean_t
-osm_pkey_find_next_free_entry(
-	IN osm_pkey_tbl_t *p_pkey_tbl,
-	OUT uint16_t      *p_block_idx,
-	OUT uint8_t       *p_pkey_idx);
+osm_pkey_find_next_free_entry(IN osm_pkey_tbl_t * p_pkey_tbl,
+			      OUT uint16_t * p_block_idx,
+			      OUT uint8_t * p_pkey_idx);
 /*
 * p_pkey_tbl
 *   [in] Pointer to the PKey table
@@ -370,8 +364,7 @@ osm_pkey_find_next_free_entry(
 *
 * SYNOPSIS
 */
-void osm_pkey_tbl_init_new_blocks(
-  const osm_pkey_tbl_t *p_pkey_tbl);
+void osm_pkey_tbl_init_new_blocks(const osm_pkey_tbl_t * p_pkey_tbl);
 /*
 *  p_pkey_tbl
 *     [in] Pointer to osm_pkey_tbl_t object.
@@ -392,11 +385,10 @@ void osm_pkey_tbl_init_new_blocks(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_pkey_tbl_get_block_and_idx(
-  IN  osm_pkey_tbl_t *p_pkey_tbl,
-  IN  uint16_t       *p_pkey,
-  OUT uint16_t       *block_idx,
-  OUT uint8_t        *pkey_index);
+osm_pkey_tbl_get_block_and_idx(IN osm_pkey_tbl_t * p_pkey_tbl,
+			       IN uint16_t * p_pkey,
+			       OUT uint16_t * block_idx,
+			       OUT uint8_t * pkey_index);
 /*
 *  p_pkey_tbl
 *     [in] Pointer to osm_pkey_tbl_t object.
@@ -424,10 +416,8 @@ osm_pkey_tbl_get_block_and_idx(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_pkey_tbl_set(
-  IN osm_pkey_tbl_t *p_pkey_tbl,
-  IN uint16_t block,
-  IN ib_pkey_table_t *p_tbl);
+osm_pkey_tbl_set(IN osm_pkey_tbl_t * p_pkey_tbl,
+		 IN uint16_t block, IN ib_pkey_table_t * p_tbl);
 /*
 *  p_pkey_tbl
 *     [in] Pointer to osm_pkey_tbl_t object.
@@ -454,10 +444,9 @@ osm_pkey_tbl_set(
 *
 * SYNOPSIS
 */
-boolean_t osm_physp_share_this_pkey(
-  IN const struct _osm_physp * const p_physp1,
-  IN const struct _osm_physp * const p_physp2,
-  IN const ib_net16_t    pkey);
+boolean_t osm_physp_share_this_pkey(IN const struct _osm_physp *const p_physp1,
+				    IN const struct _osm_physp *const p_physp2,
+				    IN const ib_net16_t pkey);
 /*
 * PARAMETERS
 *
@@ -487,9 +476,10 @@ boolean_t osm_physp_share_this_pkey(
 *
 * SYNOPSIS
 */
-ib_net16_t osm_physp_find_common_pkey(
-  IN const struct _osm_physp * const p_physp1,
-  IN const struct _osm_physp * const p_physp2 );
+ib_net16_t osm_physp_find_common_pkey(IN const struct _osm_physp *const
+				      p_physp1,
+				      IN const struct _osm_physp *const
+				      p_physp2);
 /*
 * PARAMETERS
 *
@@ -531,10 +521,9 @@ ib_net16_t osm_physp_find_common_pkey(
 *
 * SYNOPSIS
 */
-boolean_t osm_physp_share_pkey(
-  IN osm_log_t*          p_log,
-  IN const struct _osm_physp*  const p_physp_1,
-  IN const struct _osm_physp*  const p_physp_2 );
+boolean_t osm_physp_share_pkey(IN osm_log_t * p_log,
+			       IN const struct _osm_physp *const p_physp_1,
+			       IN const struct _osm_physp *const p_physp_2);
 
 /*
 * PARAMETERS
@@ -579,10 +568,9 @@ boolean_t osm_physp_share_pkey(
 *
 * SYNOPSIS
 */
-boolean_t osm_port_share_pkey(
-  IN osm_log_t*          p_log,
-  IN const struct _osm_port*   const p_port_1,
-  IN const struct _osm_port*   const p_port_2 );
+boolean_t osm_port_share_pkey(IN osm_log_t * p_log,
+			      IN const struct _osm_port *const p_port_1,
+			      IN const struct _osm_port *const p_port_2);
 
 /*
 * PARAMETERS
@@ -627,13 +615,12 @@ boolean_t osm_port_share_pkey(
 *
 * SYNOPSIS
 */
-boolean_t osm_lid_share_pkey(
-  IN osm_log_t*          p_log,
-  IN const struct _osm_subn*  const p_subn,
-  IN const ib_net16_t    lid1,
-  IN const uint8_t       port_num1,
-  IN const ib_net16_t    lid2,
-  IN const uint8_t       port_num2 );
+boolean_t osm_lid_share_pkey(IN osm_log_t * p_log,
+			     IN const struct _osm_subn *const p_subn,
+			     IN const ib_net16_t lid1,
+			     IN const uint8_t port_num1,
+			     IN const ib_net16_t lid2,
+			     IN const uint8_t port_num2);
 
 /*
 * PARAMETERS
@@ -687,10 +674,9 @@ boolean_t osm_lid_share_pkey(
 *
 * SYNOPSIS
 */
-boolean_t osm_physp_has_pkey(
-  IN osm_log_t*               p_log,
-  IN const ib_net16_t         pkey,
-  IN const struct _osm_physp* const p_physp );
+boolean_t osm_physp_has_pkey(IN osm_log_t * p_log,
+			     IN const ib_net16_t pkey,
+			     IN const struct _osm_physp *const p_physp);
 
 /*
 * PARAMETERS
@@ -719,12 +705,11 @@ boolean_t osm_physp_has_pkey(
 *
 * SYNOPSIS
 */
-void osm_pkey_get_tables(
-  IN osm_log_t			  *p_log,
-  IN osm_req_t			  *p_req,
-  IN osm_subn_t* const  p_subn,
-  IN struct _osm_node* const  p_node,
-  IN struct _osm_physp* const p_physp );
+void osm_pkey_get_tables(IN osm_log_t * p_log,
+			 IN osm_req_t * p_req,
+			 IN osm_subn_t * const p_subn,
+			 IN struct _osm_node *const p_node,
+			 IN struct _osm_physp *const p_physp);
 
 /*
 * PARAMETERS
@@ -751,5 +736,4 @@ void osm_pkey_get_tables(
 *********/
 
 END_C_DECLS
-
-#endif	/* _OSM_PKEY_H_ */
+#endif				/* _OSM_PKEY_H_ */
diff --git a/opensm/include/opensm/osm_pkey_mgr.h b/opensm/include/opensm/osm_pkey_mgr.h
index 14144c5..0832350 100644
--- a/opensm/include/opensm/osm_pkey_mgr.h
+++ b/opensm/include/opensm/osm_pkey_mgr.h
@@ -52,13 +52,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****f* OpenSM: P_Key Manager/osm_pkey_mgr_process
 * NAME
 *	osm_pkey_mgr_process
@@ -68,9 +67,7 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-osm_signal_t
-osm_pkey_mgr_process(
-	IN osm_opensm_t *p_osm );
+osm_signal_t osm_pkey_mgr_process(IN osm_opensm_t * p_osm);
 /*
 * PARAMETERS
 *	p_osm
@@ -85,5 +82,4 @@ osm_pkey_mgr_process(
 *********/
 
 END_C_DECLS
-
-#endif	/* _OSM_PKEY_MGR_H_ */
+#endif				/* _OSM_PKEY_MGR_H_ */
diff --git a/opensm/include/opensm/osm_pkey_rcv.h b/opensm/include/opensm/osm_pkey_rcv.h
index 20829b2..14e6351 100644
--- a/opensm/include/opensm/osm_pkey_rcv.h
+++ b/opensm/include/opensm/osm_pkey_rcv.h
@@ -47,13 +47,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/P_Key Receiver
 * NAME
 *  P_Key Receiver
@@ -71,7 +70,6 @@ BEGIN_C_DECLS
 *  Yael Kalka, Mellanox
 *
 *********/
-
 /****s* OpenSM: P_Key Receiver/osm_pkey_rcv_t
 * NAME
 *  osm_pkey_rcv_t
@@ -84,12 +82,11 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_pkey_rcv
-{
-  osm_subn_t *p_subn;
-  osm_req_t *p_req;
-  osm_log_t *p_log;
-  cl_plock_t *p_lock;
+typedef struct _osm_pkey_rcv {
+	osm_subn_t *p_subn;
+	osm_req_t *p_req;
+	osm_log_t *p_log;
+	cl_plock_t *p_lock;
 } osm_pkey_rcv_t;
 /*
 * FIELDS
@@ -118,8 +115,7 @@ typedef struct _osm_pkey_rcv
 *
 * SYNOPSIS
 */
-void osm_pkey_rcv_construct(
-  IN osm_pkey_rcv_t* const p_ctrl );
+void osm_pkey_rcv_construct(IN osm_pkey_rcv_t * const p_ctrl);
 /*
 * PARAMETERS
 *  p_ctrl
@@ -149,8 +145,7 @@ void osm_pkey_rcv_construct(
 *
 * SYNOPSIS
 */
-void osm_pkey_rcv_destroy(
-  IN osm_pkey_rcv_t* const p_ctrl );
+void osm_pkey_rcv_destroy(IN osm_pkey_rcv_t * const p_ctrl);
 /*
 * PARAMETERS
 *  p_ctrl
@@ -181,12 +176,11 @@ void osm_pkey_rcv_destroy(
 *
 * SYNOPSIS
 */
-ib_api_status_t osm_pkey_rcv_init(
-  IN osm_pkey_rcv_t* const p_ctrl,
-  IN osm_req_t* const p_req,
-  IN osm_subn_t* const p_subn,
-  IN osm_log_t* const p_log,
-  IN cl_plock_t* const p_lock );
+ib_api_status_t osm_pkey_rcv_init(IN osm_pkey_rcv_t * const p_ctrl,
+				  IN osm_req_t * const p_req,
+				  IN osm_subn_t * const p_subn,
+				  IN osm_log_t * const p_log,
+				  IN cl_plock_t * const p_lock);
 /*
 * PARAMETERS
 *  p_ctrl
@@ -225,9 +219,7 @@ ib_api_status_t osm_pkey_rcv_init(
 *
 * SYNOPSIS
 */
-void osm_pkey_rcv_process(
-  IN void *context,
-  IN void *data );
+void osm_pkey_rcv_process(IN void *context, IN void *data);
 /*
 * PARAMETERS
 *  context
@@ -248,5 +240,4 @@ void osm_pkey_rcv_process(
 *********/
 
 END_C_DECLS
-
-#endif   /* _OSM_PKEY_RCV_H_ */
+#endif				/* _OSM_PKEY_RCV_H_ */
diff --git a/opensm/include/opensm/osm_port.h b/opensm/include/opensm/osm_port.h
index b5acd7f..f2cfe18 100644
--- a/opensm/include/opensm/osm_port.h
+++ b/opensm/include/opensm/osm_port.h
@@ -61,13 +61,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /*
 	Forward references.
 */
@@ -109,21 +108,20 @@ struct _osm_node;
 *
 * SYNOPSIS
 */
-typedef struct _osm_physp
-{
-	ib_port_info_t		port_info;
-	ib_net64_t		port_guid;
-	uint8_t			port_num;
-	struct _osm_node	*p_node;
-	struct _osm_physp	*p_remote_physp;
-	boolean_t		healthy;
-	uint8_t			vl_high_limit;
-	unsigned		need_update;
-	osm_dr_path_t		dr_path;
-	osm_pkey_tbl_t		pkeys;
-	ib_vl_arb_table_t	vl_arb[4];
-	cl_ptr_vector_t		slvl_by_port;
-	boolean_t		got_set_resp;
+typedef struct _osm_physp {
+	ib_port_info_t port_info;
+	ib_net64_t port_guid;
+	uint8_t port_num;
+	struct _osm_node *p_node;
+	struct _osm_physp *p_remote_physp;
+	boolean_t healthy;
+	uint8_t vl_high_limit;
+	unsigned need_update;
+	osm_dr_path_t dr_path;
+	osm_pkey_tbl_t pkeys;
+	ib_vl_arb_table_t vl_arb[4];
+	cl_ptr_vector_t slvl_by_port;
+	boolean_t got_set_resp;
 } osm_physp_t;
 /*
 * FIELDS
@@ -199,9 +197,7 @@ typedef struct _osm_physp
 *
 * SYNOPSIS
 */
-void
-osm_physp_construct(
-	IN osm_physp_t* const p_physp );
+void osm_physp_construct(IN osm_physp_t * const p_physp);
 /*
 * PARAMETERS
 *	p_physp
@@ -226,14 +222,13 @@ osm_physp_construct(
 * SYNOPSIS
 */
 void
-osm_physp_init(
-	IN osm_physp_t* const p_physp,
-	IN const ib_net64_t port_guid,
-	IN const uint8_t port_num,
-	IN const struct _osm_node* const p_node,
-	IN const osm_bind_handle_t h_bind,
-	IN const uint8_t hop_count,
-	IN const uint8_t* const p_initial_path );
+osm_physp_init(IN osm_physp_t * const p_physp,
+	       IN const ib_net64_t port_guid,
+	       IN const uint8_t port_num,
+	       IN const struct _osm_node *const p_node,
+	       IN const osm_bind_handle_t h_bind,
+	       IN const uint8_t hop_count,
+	       IN const uint8_t * const p_initial_path);
 /*
 * PARAMETERS
 *	p_physp
@@ -281,9 +276,7 @@ osm_physp_init(
 *
 * SYNOPSIS
 */
-void
-osm_physp_destroy(
-  IN osm_physp_t* const p_physp );
+void osm_physp_destroy(IN osm_physp_t * const p_physp);
 /*
 * PARAMETERS
 *	p_port
@@ -312,13 +305,12 @@ osm_physp_destroy(
 *
 * SYNOPSIS
 */
-static inline boolean_t
-osm_physp_is_valid(
-	IN const osm_physp_t* const p_physp )
+static inline boolean_t osm_physp_is_valid(IN const osm_physp_t * const p_physp)
 {
-	CL_ASSERT( p_physp );
-	return( p_physp->port_guid != 0 );
+	CL_ASSERT(p_physp);
+	return (p_physp->port_guid != 0);
 }
+
 /*
 * PARAMETERS
 *	p_physp
@@ -345,12 +337,12 @@ osm_physp_is_valid(
 * SYNOPSIS
 */
 static inline boolean_t
-osm_physp_is_healthy(
-	IN const osm_physp_t* const p_physp )
+osm_physp_is_healthy(IN const osm_physp_t * const p_physp)
 {
-	CL_ASSERT( p_physp );
-	return( p_physp->healthy );
+	CL_ASSERT(p_physp);
+	return (p_physp->healthy);
 }
+
 /*
 * PARAMETERS
 *	p_physp
@@ -379,9 +371,7 @@ osm_physp_is_healthy(
 *
 * SYNOPSIS
 */
-boolean_t
-osm_link_is_healthy(
-  IN const osm_physp_t* const p_physp );
+boolean_t osm_link_is_healthy(IN const osm_physp_t * const p_physp);
 /*
 * PARAMETERS
 *	p_physp
@@ -409,13 +399,12 @@ osm_link_is_healthy(
 * SYNOPSIS
 */
 static inline void
-osm_physp_set_health(
-  IN osm_physp_t* const p_physp,
-  IN boolean_t is_healthy )
+osm_physp_set_health(IN osm_physp_t * const p_physp, IN boolean_t is_healthy)
 {
-	CL_ASSERT( p_physp );
+	CL_ASSERT(p_physp);
 	p_physp->healthy = is_healthy;
 }
+
 /*
 * PARAMETERS
 *	p_physp
@@ -446,26 +435,24 @@ osm_physp_set_health(
 * SYNOPSIS
 */
 static inline void
-osm_physp_set_port_info(
-	IN osm_physp_t* const p_physp,
-	IN const ib_port_info_t* const p_pi )
+osm_physp_set_port_info(IN osm_physp_t * const p_physp,
+			IN const ib_port_info_t * const p_pi)
 {
-	CL_ASSERT( p_pi );
-	CL_ASSERT( osm_physp_is_valid( p_physp ) );
-
-	if (ib_port_info_get_port_state(p_pi) == IB_LINK_DOWN)
-	{
-	  /* If PortState is down, only copy PortState */
-	  /* and PortPhysicalState per C14-24-2.1 */
-	  ib_port_info_set_port_state(&p_physp->port_info, IB_LINK_DOWN);
-	  ib_port_info_set_port_phys_state(
-		ib_port_info_get_port_phys_state(p_pi), &p_physp->port_info);
-	}
-	else
-	{
-	  p_physp->port_info = *p_pi;
+	CL_ASSERT(p_pi);
+	CL_ASSERT(osm_physp_is_valid(p_physp));
+
+	if (ib_port_info_get_port_state(p_pi) == IB_LINK_DOWN) {
+		/* If PortState is down, only copy PortState */
+		/* and PortPhysicalState per C14-24-2.1 */
+		ib_port_info_set_port_state(&p_physp->port_info, IB_LINK_DOWN);
+		ib_port_info_set_port_phys_state
+		    (ib_port_info_get_port_phys_state(p_pi),
+		     &p_physp->port_info);
+	} else {
+		p_physp->port_info = *p_pi;
 	}
 }
+
 /*
 * PARAMETERS
 *	p_physp
@@ -494,20 +481,19 @@ osm_physp_set_port_info(
 * SYNOPSIS
 */
 static inline ib_net16_t
-osm_physp_trim_base_lid_to_valid_range(
-	IN osm_physp_t* const p_physp )
+osm_physp_trim_base_lid_to_valid_range(IN osm_physp_t * const p_physp)
 {
 	ib_net16_t orig_lid = 0;
 
-	CL_ASSERT( osm_physp_is_valid( p_physp ) );
-	if ( ( cl_ntoh16( p_physp->port_info.base_lid ) > IB_LID_UCAST_END_HO ) ||
-             ( cl_ntoh16( p_physp->port_info.base_lid ) < IB_LID_UCAST_START_HO ) )
-	{
+	CL_ASSERT(osm_physp_is_valid(p_physp));
+	if ((cl_ntoh16(p_physp->port_info.base_lid) > IB_LID_UCAST_END_HO) ||
+	    (cl_ntoh16(p_physp->port_info.base_lid) < IB_LID_UCAST_START_HO)) {
 		orig_lid = p_physp->port_info.base_lid;
 		p_physp->port_info.base_lid = 0;
 	}
 	return orig_lid;
 }
+
 /*
 * PARAMETERS
 *	p_physp
@@ -533,11 +519,10 @@ osm_physp_trim_base_lid_to_valid_range(
 * SYNOPSIS
 */
 void
-osm_physp_set_pkey_tbl( IN osm_log_t* p_log,
-                        IN const osm_subn_t* p_subn,
-                        IN osm_physp_t* const p_physp,
-                        IN ib_pkey_table_t *p_pkey_tbl,
-                        IN uint16_t block_num );
+osm_physp_set_pkey_tbl(IN osm_log_t * p_log,
+		       IN const osm_subn_t * p_subn,
+		       IN osm_physp_t * const p_physp,
+		       IN ib_pkey_table_t * p_pkey_tbl, IN uint16_t block_num);
 /*
 * PARAMETERS
 *	p_log
@@ -576,16 +561,17 @@ osm_physp_set_pkey_tbl( IN osm_log_t* p_log,
 *
 * SYNOPSIS
 */
-static inline const osm_pkey_tbl_t *
-osm_physp_get_pkey_tbl( IN const osm_physp_t* const p_physp )
+static inline const osm_pkey_tbl_t *osm_physp_get_pkey_tbl(IN const osm_physp_t
+							   * const p_physp)
 {
-  CL_ASSERT( osm_physp_is_valid( p_physp ) );
-  /*
-    (14.2.5.7) - the block number valid values are 0-2047, and are further
-    limited by the size of the P_Key table specified by the PartitionCap on the node.
-  */
-  return( &p_physp->pkeys );
+	CL_ASSERT(osm_physp_is_valid(p_physp));
+	/*
+	   (14.2.5.7) - the block number valid values are 0-2047, and are further
+	   limited by the size of the P_Key table specified by the PartitionCap on the node.
+	 */
+	return (&p_physp->pkeys);
 };
+
 /*
 * PARAMETERS
 *	p_physp
@@ -609,16 +595,17 @@ osm_physp_get_pkey_tbl( IN const osm_physp_t* const p_physp )
 *
 * SYNOPSIS
 */
-static inline osm_pkey_tbl_t *
-osm_physp_get_mod_pkey_tbl( IN osm_physp_t* const p_physp )
+static inline osm_pkey_tbl_t *osm_physp_get_mod_pkey_tbl(IN osm_physp_t *
+							 const p_physp)
 {
-  CL_ASSERT( osm_physp_is_valid( p_physp ) );
-  /*
-    (14.2.5.7) - the block number valid values are 0-2047, and are further
-    limited by the size of the P_Key table specified by the PartitionCap on the node.
-  */
-  return( &p_physp->pkeys );
+	CL_ASSERT(osm_physp_is_valid(p_physp));
+	/*
+	   (14.2.5.7) - the block number valid values are 0-2047, and are further
+	   limited by the size of the P_Key table specified by the PartitionCap on the node.
+	 */
+	return (&p_physp->pkeys);
 };
+
 /*
 * PARAMETERS
 *	p_physp
@@ -643,17 +630,17 @@ osm_physp_get_mod_pkey_tbl( IN osm_physp_t* const p_physp )
 * SYNOPSIS
 */
 static inline void
-osm_physp_set_slvl_tbl( IN osm_physp_t* const p_physp,
-			IN ib_slvl_table_t *p_slvl_tbl,
-			IN uint8_t in_port_num )
+osm_physp_set_slvl_tbl(IN osm_physp_t * const p_physp,
+		       IN ib_slvl_table_t * p_slvl_tbl, IN uint8_t in_port_num)
 {
-  ib_slvl_table_t *p_tbl;
+	ib_slvl_table_t *p_tbl;
 
-  CL_ASSERT( p_slvl_tbl );
-  CL_ASSERT( osm_physp_is_valid( p_physp ) );
-  p_tbl = cl_ptr_vector_get(&p_physp->slvl_by_port, in_port_num);
-  *p_tbl = *p_slvl_tbl;
+	CL_ASSERT(p_slvl_tbl);
+	CL_ASSERT(osm_physp_is_valid(p_physp));
+	p_tbl = cl_ptr_vector_get(&p_physp->slvl_by_port, in_port_num);
+	*p_tbl = *p_slvl_tbl;
 }
+
 /*
 * PARAMETERS
 *	p_physp
@@ -683,16 +670,17 @@ osm_physp_set_slvl_tbl( IN osm_physp_t* const p_physp,
 *
 * SYNOPSIS
 */
-static inline ib_slvl_table_t *
-osm_physp_get_slvl_tbl( IN const osm_physp_t* const p_physp,
-			IN uint8_t in_port_num )
+static inline ib_slvl_table_t *osm_physp_get_slvl_tbl(IN const osm_physp_t *
+						      const p_physp,
+						      IN uint8_t in_port_num)
 {
-  ib_slvl_table_t *p_tbl;
+	ib_slvl_table_t *p_tbl;
 
-  CL_ASSERT( osm_physp_is_valid( p_physp ) );
-  p_tbl = cl_ptr_vector_get(&p_physp->slvl_by_port, in_port_num);
-  return(p_tbl);
+	CL_ASSERT(osm_physp_is_valid(p_physp));
+	p_tbl = cl_ptr_vector_get(&p_physp->slvl_by_port, in_port_num);
+	return (p_tbl);
 }
+
 /*
 * PARAMETERS
 *	p_physp
@@ -720,15 +708,15 @@ osm_physp_get_slvl_tbl( IN const osm_physp_t* const p_physp,
 * SYNOPSIS
 */
 static inline void
-osm_physp_set_vla_tbl( IN osm_physp_t* const p_physp,
-		       IN ib_vl_arb_table_t *p_vla_tbl,
-		       IN uint8_t block_num )
+osm_physp_set_vla_tbl(IN osm_physp_t * const p_physp,
+		      IN ib_vl_arb_table_t * p_vla_tbl, IN uint8_t block_num)
 {
-  CL_ASSERT( p_vla_tbl );
-  CL_ASSERT( osm_physp_is_valid( p_physp ) );
-  CL_ASSERT( (1 <= block_num) && (block_num <= 4));
-  p_physp->vl_arb[block_num - 1] = *p_vla_tbl;
+	CL_ASSERT(p_vla_tbl);
+	CL_ASSERT(osm_physp_is_valid(p_physp));
+	CL_ASSERT((1 <= block_num) && (block_num <= 4));
+	p_physp->vl_arb[block_num - 1] = *p_vla_tbl;
 }
+
 /*
 * PARAMETERS
 *	p_physp
@@ -759,14 +747,15 @@ osm_physp_set_vla_tbl( IN osm_physp_t* const p_physp,
 *
 * SYNOPSIS
 */
-static inline ib_vl_arb_table_t *
-osm_physp_get_vla_tbl( IN osm_physp_t* const p_physp,
-		       IN uint8_t block_num )
+static inline ib_vl_arb_table_t *osm_physp_get_vla_tbl(IN osm_physp_t *
+						       const p_physp,
+						       IN uint8_t block_num)
 {
-  CL_ASSERT( osm_physp_is_valid( p_physp ) );
-  CL_ASSERT( (1 <= block_num) && (block_num <= 4));
-  return(& (p_physp->vl_arb[block_num - 1]));
+	CL_ASSERT(osm_physp_is_valid(p_physp));
+	CL_ASSERT((1 <= block_num) && (block_num <= 4));
+	return (&(p_physp->vl_arb[block_num - 1]));
 }
+
 /*
 * PARAMETERS
 *	p_physp
@@ -794,13 +783,13 @@ osm_physp_get_vla_tbl( IN osm_physp_t* const p_physp,
 *
 * SYNOPSIS
 */
-static inline osm_physp_t*
-osm_physp_get_remote(
-	IN const osm_physp_t* const p_physp )
+static inline osm_physp_t *osm_physp_get_remote(IN const osm_physp_t *
+						const p_physp)
 {
-	CL_ASSERT( osm_physp_is_valid( p_physp ) );
-	return( p_physp->p_remote_physp );
+	CL_ASSERT(osm_physp_is_valid(p_physp));
+	return (p_physp->p_remote_physp);
 }
+
 /*
 * PARAMETERS
 *	p_physp
@@ -826,12 +815,12 @@ osm_physp_get_remote(
 * SYNOPSIS
 */
 static inline ib_net64_t
-osm_physp_get_port_guid(
-	IN const osm_physp_t* const p_physp )
+osm_physp_get_port_guid(IN const osm_physp_t * const p_physp)
 {
-	CL_ASSERT( osm_physp_is_valid( p_physp ) );
-	return( p_physp->port_guid );
+	CL_ASSERT(osm_physp_is_valid(p_physp));
+	return (p_physp->port_guid);
 }
+
 /*
 * PARAMETERS
 *	p_physp
@@ -856,12 +845,12 @@ osm_physp_get_port_guid(
 * SYNOPSIS
 */
 static inline ib_net64_t
-osm_physp_get_subnet_prefix(
-	IN const osm_physp_t* const p_physp )
+osm_physp_get_subnet_prefix(IN const osm_physp_t * const p_physp)
 {
-	CL_ASSERT( osm_physp_is_valid( p_physp ) );
-	return( p_physp->port_info.subnet_prefix );
+	CL_ASSERT(osm_physp_is_valid(p_physp));
+	return (p_physp->port_info.subnet_prefix);
 }
+
 /*
 * PARAMETERS
 *	p_physp
@@ -887,17 +876,17 @@ osm_physp_get_subnet_prefix(
 * SYNOPSIS
 */
 static inline boolean_t
-osm_physp_link_exists(
-	IN const osm_physp_t* const p_physp,
-	IN const osm_physp_t* const p_remote_physp )
+osm_physp_link_exists(IN const osm_physp_t * const p_physp,
+		      IN const osm_physp_t * const p_remote_physp)
 {
-	CL_ASSERT( p_physp );
-	CL_ASSERT( osm_physp_is_valid( p_physp ) );
-	CL_ASSERT( p_remote_physp );
-	CL_ASSERT( osm_physp_is_valid( p_remote_physp ) );
-	return(  (p_physp->p_remote_physp == p_remote_physp ) &&
-			(p_remote_physp->p_remote_physp == p_physp ) );
+	CL_ASSERT(p_physp);
+	CL_ASSERT(osm_physp_is_valid(p_physp));
+	CL_ASSERT(p_remote_physp);
+	CL_ASSERT(osm_physp_is_valid(p_remote_physp));
+	return ((p_physp->p_remote_physp == p_remote_physp) &&
+		(p_remote_physp->p_remote_physp == p_physp));
 }
+
 /*
 * PARAMETERS
 *	p_physp
@@ -926,15 +915,15 @@ osm_physp_link_exists(
 * SYNOPSIS
 */
 static inline void
-osm_physp_link(
-	IN osm_physp_t* const p_physp,
-	IN osm_physp_t* const p_remote_physp )
+osm_physp_link(IN osm_physp_t * const p_physp,
+	       IN osm_physp_t * const p_remote_physp)
 {
-	CL_ASSERT( p_physp );
-	CL_ASSERT( p_remote_physp );
+	CL_ASSERT(p_physp);
+	CL_ASSERT(p_remote_physp);
 	p_physp->p_remote_physp = p_remote_physp;
 	p_remote_physp->p_remote_physp = p_physp;
 }
+
 /*
 * PARAMETERS
 *	p_physp
@@ -962,16 +951,16 @@ osm_physp_link(
 * SYNOPSIS
 */
 static inline void
-osm_physp_unlink(
-	IN osm_physp_t* const p_physp,
-	IN osm_physp_t* const p_remote_physp )
+osm_physp_unlink(IN osm_physp_t * const p_physp,
+		 IN osm_physp_t * const p_remote_physp)
 {
-	CL_ASSERT( p_physp );
-	CL_ASSERT( p_remote_physp );
-	CL_ASSERT( osm_physp_link_exists( p_physp, p_remote_physp ) );
+	CL_ASSERT(p_physp);
+	CL_ASSERT(p_remote_physp);
+	CL_ASSERT(osm_physp_link_exists(p_physp, p_remote_physp));
 	p_physp->p_remote_physp = NULL;
 	p_remote_physp->p_remote_physp = NULL;
 }
+
 /*
 * PARAMETERS
 *	p_physp
@@ -1000,15 +989,15 @@ osm_physp_unlink(
 * SYNOPSIS
 */
 static inline boolean_t
-osm_physp_has_any_link(
-	IN const osm_physp_t* const p_physp )
+osm_physp_has_any_link(IN const osm_physp_t * const p_physp)
 {
-	CL_ASSERT( p_physp );
-	if( osm_physp_is_valid( p_physp ) )
-		return( p_physp->p_remote_physp != NULL );
+	CL_ASSERT(p_physp);
+	if (osm_physp_is_valid(p_physp))
+		return (p_physp->p_remote_physp != NULL);
 	else
-		return( FALSE );
+		return (FALSE);
 }
+
 /*
 * PARAMETERS
 *	p_physp
@@ -1034,13 +1023,13 @@ osm_physp_has_any_link(
 * SYNOPSIS
 */
 static inline uint8_t
-osm_physp_get_port_num(
-	IN const osm_physp_t* const p_physp )
+osm_physp_get_port_num(IN const osm_physp_t * const p_physp)
 {
-	CL_ASSERT( p_physp );
-	CL_ASSERT( osm_physp_is_valid( p_physp ) );
-	return( p_physp->port_num );
+	CL_ASSERT(p_physp);
+	CL_ASSERT(osm_physp_is_valid(p_physp));
+	return (p_physp->port_num);
 }
+
 /*
 * PARAMETERS
 *	p_physp
@@ -1063,14 +1052,14 @@ osm_physp_get_port_num(
 *
 * SYNOPSIS
 */
-static inline struct _osm_node*
-osm_physp_get_node_ptr(
-	IN const osm_physp_t* const p_physp )
+static inline struct _osm_node *osm_physp_get_node_ptr(IN const osm_physp_t *
+						       const p_physp)
 {
-	CL_ASSERT( p_physp );
-	CL_ASSERT( osm_physp_is_valid( p_physp ) );
-	return( (struct _osm_node*)p_physp->p_node );
+	CL_ASSERT(p_physp);
+	CL_ASSERT(osm_physp_is_valid(p_physp));
+	return ((struct _osm_node *)p_physp->p_node);
 }
+
 /*
 * PARAMETERS
 *	p_physp
@@ -1094,13 +1083,13 @@ osm_physp_get_node_ptr(
 * SYNOPSIS
 */
 static inline uint8_t
-osm_physp_get_port_state(
-	IN const osm_physp_t* const p_physp )
+osm_physp_get_port_state(IN const osm_physp_t * const p_physp)
 {
-	CL_ASSERT( p_physp );
-	CL_ASSERT( osm_physp_is_valid( p_physp ) );
-	return( ib_port_info_get_port_state( &p_physp->port_info ));
+	CL_ASSERT(p_physp);
+	CL_ASSERT(osm_physp_is_valid(p_physp));
+	return (ib_port_info_get_port_state(&p_physp->port_info));
 }
+
 /*
 * PARAMETERS
 *	p_physp
@@ -1124,13 +1113,13 @@ osm_physp_get_port_state(
 * SYNOPSIS
 */
 static inline ib_net16_t
-osm_physp_get_base_lid(
-	IN const osm_physp_t* const p_physp )
+osm_physp_get_base_lid(IN const osm_physp_t * const p_physp)
 {
-	CL_ASSERT( p_physp );
-	CL_ASSERT( osm_physp_is_valid( p_physp ) );
-	return( p_physp->port_info.base_lid );
+	CL_ASSERT(p_physp);
+	CL_ASSERT(osm_physp_is_valid(p_physp));
+	return (p_physp->port_info.base_lid);
 }
+
 /*
 * PARAMETERS
 *	p_physp
@@ -1153,14 +1142,13 @@ osm_physp_get_base_lid(
 *
 * SYNOPSIS
 */
-static inline uint8_t
-osm_physp_get_lmc(
-	IN const osm_physp_t* const p_physp )
+static inline uint8_t osm_physp_get_lmc(IN const osm_physp_t * const p_physp)
 {
-	CL_ASSERT( p_physp );
-	CL_ASSERT( osm_physp_is_valid( p_physp ) );
-	return( ib_port_info_get_lmc( &p_physp->port_info ) );
+	CL_ASSERT(p_physp);
+	CL_ASSERT(osm_physp_is_valid(p_physp));
+	return (ib_port_info_get_lmc(&p_physp->port_info));
 }
+
 /*
 * PARAMETERS
 *	p_physp
@@ -1183,14 +1171,14 @@ osm_physp_get_lmc(
 *
 * SYNOPSIS
 */
-static inline osm_dr_path_t*
-osm_physp_get_dr_path_ptr(
-	IN const osm_physp_t* const p_physp )
+static inline osm_dr_path_t *osm_physp_get_dr_path_ptr(IN const osm_physp_t *
+						       const p_physp)
 {
-	CL_ASSERT( p_physp );
-	CL_ASSERT( osm_physp_is_valid( p_physp ) );
-	return( (osm_dr_path_t*)&p_physp->dr_path );
+	CL_ASSERT(p_physp);
+	CL_ASSERT(osm_physp_is_valid(p_physp));
+	return ((osm_dr_path_t *) & p_physp->dr_path);
 }
+
 /*
 * PARAMETERS
 *	p_physp
@@ -1239,8 +1227,7 @@ osm_physp_get_dr_path_ptr(
 *
 * SYNOPSIS
 */
-typedef enum _osm_port_lid_category
-{
+typedef enum _osm_port_lid_category {
 	OSM_PORT_LID_ASSIGNED = 0,
 	OSM_PORT_LID_UNASSIGNED,
 	OSM_PORT_LID_CONFLICT,
@@ -1278,15 +1265,14 @@ typedef enum _osm_port_lid_category
 *
 * SYNOPSIS
 */
-typedef struct _osm_port
-{
-	cl_map_item_t			map_item;
-	struct _osm_node		*p_node;
-	ib_net64_t			guid;
-	uint32_t			discovery_count;
-	unsigned			is_new;
-	osm_physp_t			*p_physp;
-	cl_qlist_t			mcm_list;
+typedef struct _osm_port {
+	cl_map_item_t map_item;
+	struct _osm_node *p_node;
+	ib_net64_t guid;
+	uint32_t discovery_count;
+	unsigned is_new;
+	osm_physp_t *p_physp;
+	cl_qlist_t mcm_list;
 } osm_port_t;
 /*
 * FIELDS
@@ -1324,9 +1310,7 @@ typedef struct _osm_port
 *
 * SYNOPSIS
 */
-void
-osm_port_delete(
-	IN OUT osm_port_t** const pp_port );
+void osm_port_delete(IN OUT osm_port_t ** const pp_port);
 /*
 * PARAMETERS
 *	pp_port
@@ -1352,10 +1336,8 @@ osm_port_delete(
 *
 * SYNOPSIS
 */
-osm_port_t*
-osm_port_new(
-	IN const ib_node_info_t* p_ni,
-	IN const struct _osm_node* const p_parent_node );
+osm_port_t *osm_port_new(IN const ib_node_info_t * p_ni,
+			 IN const struct _osm_node *const p_parent_node);
 /*
 * PARAMETERS
 *	p_ni
@@ -1385,12 +1367,12 @@ osm_port_new(
 * SYNOPSIS
 */
 static inline ib_net16_t
-osm_port_get_base_lid(
-	IN const osm_port_t* const p_port )
+osm_port_get_base_lid(IN const osm_port_t * const p_port)
 {
-	CL_ASSERT( p_port->p_physp && osm_physp_is_valid( p_port->p_physp ) );
-	return( osm_physp_get_base_lid( p_port->p_physp ));
+	CL_ASSERT(p_port->p_physp && osm_physp_is_valid(p_port->p_physp));
+	return (osm_physp_get_base_lid(p_port->p_physp));
 }
+
 /*
 * PARAMETERS
 *	p_port
@@ -1415,13 +1397,12 @@ osm_port_get_base_lid(
 *
 * SYNOPSIS
 */
-static inline uint8_t
-osm_port_get_lmc(
-	IN const osm_port_t* const p_port )
+static inline uint8_t osm_port_get_lmc(IN const osm_port_t * const p_port)
 {
-	CL_ASSERT( p_port->p_physp && osm_physp_is_valid( p_port->p_physp ) );
-	return( osm_physp_get_lmc( p_port->p_physp ));
+	CL_ASSERT(p_port->p_physp && osm_physp_is_valid(p_port->p_physp));
+	return (osm_physp_get_lmc(p_port->p_physp));
 }
+
 /*
 * PARAMETERS
 *	p_port
@@ -1445,12 +1426,11 @@ osm_port_get_lmc(
 *
 * SYNOPSIS
 */
-static inline ib_net64_t
-osm_port_get_guid(
-	IN const osm_port_t* const p_port )
+static inline ib_net64_t osm_port_get_guid(IN const osm_port_t * const p_port)
 {
-	return( p_port->guid );
+	return (p_port->guid);
 }
+
 /*
 * PARAMETERS
 *	p_port
@@ -1476,10 +1456,9 @@ osm_port_get_guid(
 * SYNOPSIS
 */
 void
-osm_port_get_lid_range_ho(
-	IN const osm_port_t* const p_port,
-	OUT uint16_t* const p_min_lid,
-	OUT uint16_t* const p_max_lid );
+osm_port_get_lid_range_ho(IN const osm_port_t * const p_port,
+			  OUT uint16_t * const p_min_lid,
+			  OUT uint16_t * const p_max_lid);
 /*
 * PARAMETERS
 *	p_port
@@ -1511,10 +1490,9 @@ osm_port_get_lid_range_ho(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_get_port_by_base_lid(
-	IN const osm_subn_t*       const p_subn,
-	IN const ib_net16_t        lid,
-	IN OUT const osm_port_t**  const pp_port );
+osm_get_port_by_base_lid(IN const osm_subn_t * const p_subn,
+			 IN const ib_net16_t lid,
+			 IN OUT const osm_port_t ** const pp_port);
 /*
 * PARAMETERS
 *	p_subn
@@ -1547,9 +1525,7 @@ osm_get_port_by_base_lid(
 * SYNOPSIS
 */
 void
-osm_port_add_new_physp(
-	IN osm_port_t* const p_port,
-	IN const uint8_t port_num );
+osm_port_add_new_physp(IN osm_port_t * const p_port, IN const uint8_t port_num);
 /*
 * PARAMETERS
 *	p_port
@@ -1577,9 +1553,7 @@ osm_port_add_new_physp(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_port_add_mgrp(
-	IN osm_port_t* const p_port,
-	IN const ib_net16_t mlid );
+osm_port_add_mgrp(IN osm_port_t * const p_port, IN const ib_net16_t mlid);
 /*
 * PARAMETERS
 *	p_port
@@ -1608,9 +1582,7 @@ osm_port_add_mgrp(
 * SYNOPSIS
 */
 void
-osm_port_remove_mgrp(
-	IN osm_port_t* const p_port,
-	IN const ib_net16_t mlid );
+osm_port_remove_mgrp(IN osm_port_t * const p_port, IN const ib_net16_t mlid);
 /*
 * PARAMETERS
 *	p_port
@@ -1637,9 +1609,7 @@ osm_port_remove_mgrp(
 *
 * SYNOPSIS
 */
-void
-osm_port_remove_all_mgrp(
-	IN osm_port_t* const p_port );
+void osm_port_remove_all_mgrp(IN osm_port_t * const p_port);
 /*
 * PARAMETERS
 *	p_port
@@ -1665,9 +1635,7 @@ osm_port_remove_all_mgrp(
 * SYNOPSIS
 */
 uint8_t
-osm_physp_calc_link_mtu(
-	IN osm_log_t*           p_log,
-	IN const osm_physp_t*   p_physp );
+osm_physp_calc_link_mtu(IN osm_log_t * p_log, IN const osm_physp_t * p_physp);
 /*
 * PARAMETERS
 *	p_log
@@ -1696,10 +1664,9 @@ osm_physp_calc_link_mtu(
 * SYNOPSIS
 */
 uint8_t
-osm_physp_calc_link_op_vls(
-	IN osm_log_t*                p_log,
-	IN const osm_subn_t *        p_subn,
-	IN const osm_physp_t*        p_physp );
+osm_physp_calc_link_op_vls(IN osm_log_t * p_log,
+			   IN const osm_subn_t * p_subn,
+			   IN const osm_physp_t * p_physp);
 /*
 * PARAMETERS
 *	p_log
@@ -1731,11 +1698,10 @@ osm_physp_calc_link_op_vls(
 * SYNOPSIS
 */
 void
-osm_physp_replace_dr_path_with_alternate_dr_path(
-  IN osm_log_t           *p_log,
-  IN osm_subn_t  const   *p_subn,
-  IN osm_physp_t const   *p_physp,
-  IN osm_bind_handle_t   *h_bind );
+osm_physp_replace_dr_path_with_alternate_dr_path(IN osm_log_t * p_log,
+						 IN osm_subn_t const *p_subn,
+						 IN osm_physp_t const *p_physp,
+						 IN osm_bind_handle_t * h_bind);
 /*
 * PARAMETERS
 *	p_log
@@ -1760,5 +1726,4 @@ osm_physp_replace_dr_path_with_alternate_dr_path(
 *********/
 
 END_C_DECLS
-
-#endif		/* _OSM_PORT_H_ */
+#endif				/* _OSM_PORT_H_ */
diff --git a/opensm/include/opensm/osm_port_info_rcv.h b/opensm/include/opensm/osm_port_info_rcv.h
index e4561c8..9f3ab22 100644
--- a/opensm/include/opensm/osm_port_info_rcv.h
+++ b/opensm/include/opensm/osm_port_info_rcv.h
@@ -61,13 +61,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/Port Info Receiver
 * NAME
 *	Port Info Receiver
@@ -85,7 +84,6 @@ BEGIN_C_DECLS
 *	Steve King, Intel
 *
 *********/
-
 /****s* OpenSM: Port Info Receiver/osm_pi_rcv_t
 * NAME
 *	osm_pi_rcv_t
@@ -98,13 +96,12 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_pi_rcv
-{
-   osm_subn_t              *p_subn;
-   osm_req_t               *p_req;
-   osm_log_t               *p_log;
-   osm_state_mgr_t         *p_state_mgr;
-   cl_plock_t              *p_lock;
+typedef struct _osm_pi_rcv {
+	osm_subn_t *p_subn;
+	osm_req_t *p_req;
+	osm_log_t *p_log;
+	osm_state_mgr_t *p_state_mgr;
+	cl_plock_t *p_lock;
 } osm_pi_rcv_t;
 /*
 * FIELDS
@@ -136,8 +133,7 @@ typedef struct _osm_pi_rcv
 *
 * SYNOPSIS
 */
-void osm_pi_rcv_construct(
-	IN osm_pi_rcv_t* const p_ctrl );
+void osm_pi_rcv_construct(IN osm_pi_rcv_t * const p_ctrl);
 /*
 * PARAMETERS
 *	p_ctrl
@@ -167,8 +163,7 @@ void osm_pi_rcv_construct(
 *
 * SYNOPSIS
 */
-void osm_pi_rcv_destroy(
-	IN osm_pi_rcv_t* const p_ctrl );
+void osm_pi_rcv_destroy(IN osm_pi_rcv_t * const p_ctrl);
 /*
 * PARAMETERS
 *	p_ctrl
@@ -199,13 +194,12 @@ void osm_pi_rcv_destroy(
 *
 * SYNOPSIS
 */
-ib_api_status_t osm_pi_rcv_init(
-	IN osm_pi_rcv_t* const p_ctrl,
-	IN osm_req_t* const p_req,
-	IN osm_subn_t* const p_subn,
-	IN osm_log_t* const p_log,
-	IN osm_state_mgr_t* const p_state_mgr,
-	IN cl_plock_t* const p_lock );
+ib_api_status_t osm_pi_rcv_init(IN osm_pi_rcv_t * const p_ctrl,
+				IN osm_req_t * const p_req,
+				IN osm_subn_t * const p_subn,
+				IN osm_log_t * const p_log,
+				IN osm_state_mgr_t * const p_state_mgr,
+				IN cl_plock_t * const p_lock);
 /*
 * PARAMETERS
 *	p_ctrl
@@ -247,9 +241,7 @@ ib_api_status_t osm_pi_rcv_init(
 *
 * SYNOPSIS
 */
-void osm_pi_rcv_process(
-	IN void *context,
-	IN void *data );
+void osm_pi_rcv_process(IN void *context, IN void *data);
 /*
 * PARAMETERS
 *	context
@@ -270,5 +262,4 @@ void osm_pi_rcv_process(
 *********/
 
 END_C_DECLS
-
-#endif	/* _OSM_PI_RCV_H_ */
+#endif				/* _OSM_PI_RCV_H_ */
diff --git a/opensm/include/opensm/osm_port_profile.h b/opensm/include/opensm/osm_port_profile.h
index e6c5426..2442850 100644
--- a/opensm/include/opensm/osm_port_profile.h
+++ b/opensm/include/opensm/osm_port_profile.h
@@ -61,13 +61,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/Port Profile
 * NAME
 *	Port Profile
@@ -81,7 +80,6 @@ BEGIN_C_DECLS
 *	Steve King, Intel
 *
 *********/
-
 /****s* OpenSM: Switch/osm_port_profile_t
 * NAME
 *	osm_port_profile_t
@@ -96,9 +94,8 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_port_profile
-{
-	uint32_t		num_paths;
+typedef struct _osm_port_profile {
+	uint32_t num_paths;
 } osm_port_profile_t;
 /*
 * FIELDS
@@ -117,13 +114,12 @@ typedef struct _osm_port_profile
 *
 * SYNOPSIS
 */
-static inline void
-osm_port_prof_construct(
-	IN osm_port_profile_t* const p_prof )
+static inline void osm_port_prof_construct(IN osm_port_profile_t * const p_prof)
 {
-	CL_ASSERT( p_prof );
-	memset( p_prof, 0, sizeof(*p_prof) );
+	CL_ASSERT(p_prof);
+	memset(p_prof, 0, sizeof(*p_prof));
 }
+
 /*
 * PARAMETERS
 *	p_prof
@@ -148,12 +144,12 @@ osm_port_prof_construct(
 * SYNOPSIS
 */
 static inline void
-osm_port_prof_path_count_inc(
-	IN osm_port_profile_t* const p_prof )
+osm_port_prof_path_count_inc(IN osm_port_profile_t * const p_prof)
 {
-	CL_ASSERT( p_prof );
+	CL_ASSERT(p_prof);
 	p_prof->num_paths++;
 }
+
 /*
 * PARAMETERS
 *	p_pro
@@ -177,11 +173,11 @@ osm_port_prof_path_count_inc(
 * SYNOPSIS
 */
 static inline uint32_t
-osm_port_prof_path_count_get(
-	IN const osm_port_profile_t* const p_prof )
+osm_port_prof_path_count_get(IN const osm_port_profile_t * const p_prof)
 {
-	return( p_prof->num_paths );
+	return (p_prof->num_paths);
 }
+
 /*
 * PARAMETERS
 *	p_pro
@@ -206,22 +202,21 @@ osm_port_prof_path_count_get(
 * SYNOPSIS
 */
 static inline boolean_t
-osm_port_prof_is_ignored_port(
-	IN const osm_subn_t *p_subn,
-	IN ib_net64_t port_guid,
-	IN uint8_t port_num )
+osm_port_prof_is_ignored_port(IN const osm_subn_t * p_subn,
+			      IN ib_net64_t port_guid, IN uint8_t port_num)
 {
-  const cl_map_t *p_map = &(p_subn->opt.port_prof_ignore_guids);
-  const void *p_obj = cl_map_get(p_map, port_guid);
-  size_t res;
+	const cl_map_t *p_map = &(p_subn->opt.port_prof_ignore_guids);
+	const void *p_obj = cl_map_get(p_map, port_guid);
+	size_t res;
 
-  // HACK: we currently support ignoring ports 0 - 31
-  if (p_obj != NULL) {
-	 res = (size_t)p_obj & (size_t)(1 << port_num);
-	 return (res != 0);
-  }
-  return FALSE;
+	// HACK: we currently support ignoring ports 0 - 31
+	if (p_obj != NULL) {
+		res = (size_t) p_obj & (size_t) (1 << port_num);
+		return (res != 0);
+	}
+	return FALSE;
 }
+
 /*
 * PARAMETERS
 *	p_subn
@@ -248,28 +243,26 @@ osm_port_prof_is_ignored_port(
 * SYNOPSIS
 */
 static inline void
-osm_port_prof_set_ignored_port(
-	IN osm_subn_t *p_subn,
-	IN ib_net64_t port_guid,
-	IN uint8_t port_num )
+osm_port_prof_set_ignored_port(IN osm_subn_t * p_subn,
+			       IN ib_net64_t port_guid, IN uint8_t port_num)
 {
-  cl_map_t *p_map = &(p_subn->opt.port_prof_ignore_guids);
-  const void *p_obj = cl_map_get(p_map, port_guid);
-  size_t value = 0;
+	cl_map_t *p_map = &(p_subn->opt.port_prof_ignore_guids);
+	const void *p_obj = cl_map_get(p_map, port_guid);
+	size_t value = 0;
 
-  // HACK: we currently support ignoring ports 0 - 31
-  CL_ASSERT(port_num < 32);
+	// HACK: we currently support ignoring ports 0 - 31
+	CL_ASSERT(port_num < 32);
 
-  if (p_obj != NULL) {
-	 value = (size_t)p_obj;
-	 cl_map_remove(p_map, port_guid);
-  }
+	if (p_obj != NULL) {
+		value = (size_t) p_obj;
+		cl_map_remove(p_map, port_guid);
+	}
 
-  value = value | (1 << port_num);
-  cl_map_insert(&(p_subn->opt.port_prof_ignore_guids),
-					 port_guid,
-					 (void *)value);
+	value = value | (1 << port_num);
+	cl_map_insert(&(p_subn->opt.port_prof_ignore_guids),
+		      port_guid, (void *)value);
 }
+
 /*
 * PARAMETERS
 *	p_subn
@@ -287,5 +280,4 @@ osm_port_prof_set_ignored_port(
 *********/
 
 END_C_DECLS
-
-#endif		/* _OSM_PORT_PROFILE_H_ */
+#endif				/* _OSM_PORT_PROFILE_H_ */
diff --git a/opensm/include/opensm/osm_rand_fwd_tbl.h b/opensm/include/opensm/osm_rand_fwd_tbl.h
index bcda9b3..8f46ef2 100644
--- a/opensm/include/opensm/osm_rand_fwd_tbl.h
+++ b/opensm/include/opensm/osm_rand_fwd_tbl.h
@@ -55,13 +55,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/Random Forwarding Table
 * NAME
 *	Random Forwarding Table
@@ -81,7 +80,6 @@ BEGIN_C_DECLS
 *	Steve King, Intel
 *
 *********/
-
 /****s* OpenSM: Forwarding Table/osm_rand_fwd_tbl_t
 * NAME
 *	osm_rand_fwd_tbl_t
@@ -94,10 +92,9 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_rand_fwd_tbl
-{
+typedef struct _osm_rand_fwd_tbl {
 	/* PLACE HOLDER STRUCTURE ONLY!! */
-	uint32_t				size;
+	uint32_t size;
 } osm_rand_fwd_tbl_t;
 /*
 * FIELDS
@@ -116,16 +113,15 @@ typedef struct _osm_rand_fwd_tbl
 *
 * SYNOPSIS
 */
-static inline void
-osm_rand_tbl_delete(
-	IN osm_rand_fwd_tbl_t** const pp_tbl )
+static inline void osm_rand_tbl_delete(IN osm_rand_fwd_tbl_t ** const pp_tbl)
 {
 	/*
-		TO DO - This is a place holder function only!
-	*/
-	free( *pp_tbl );
+	   TO DO - This is a place holder function only!
+	 */
+	free(*pp_tbl);
 	*pp_tbl = NULL;
 }
+
 /*
 * PARAMETERS
 *	pp_tbl
@@ -151,17 +147,16 @@ osm_rand_tbl_delete(
 * SYNOPSIS
 */
 static inline void
-osm_rand_fwd_tbl_set(
-	IN osm_rand_fwd_tbl_t* const p_tbl,
-	IN const uint16_t lid_ho,
-	IN const uint8_t port )
+osm_rand_fwd_tbl_set(IN osm_rand_fwd_tbl_t * const p_tbl,
+		     IN const uint16_t lid_ho, IN const uint8_t port)
 {
 	/* Random forwarding tables not supported yet. */
-	UNUSED_PARAM( p_tbl );
-	UNUSED_PARAM( lid_ho );
-	UNUSED_PARAM( port );
-	CL_ASSERT( FALSE );
+	UNUSED_PARAM(p_tbl);
+	UNUSED_PARAM(lid_ho);
+	UNUSED_PARAM(port);
+	CL_ASSERT(FALSE);
 }
+
 /*
 * PARAMETERS
 *	p_tbl
@@ -191,18 +186,18 @@ osm_rand_fwd_tbl_set(
 * SYNOPSIS
 */
 static inline ib_api_status_t
-osm_rand_fwd_tbl_set_block(
-	IN osm_rand_fwd_tbl_t* const p_tbl,
-	IN const uint8_t* const p_block,
-	IN const uint32_t block_num )
+osm_rand_fwd_tbl_set_block(IN osm_rand_fwd_tbl_t * const p_tbl,
+			   IN const uint8_t * const p_block,
+			   IN const uint32_t block_num)
 {
 	/* Random forwarding tables not supported yet. */
-	UNUSED_PARAM( p_tbl );
-	UNUSED_PARAM( p_block );
-	UNUSED_PARAM( block_num );
-	CL_ASSERT( FALSE );
-	return( IB_ERROR );
+	UNUSED_PARAM(p_tbl);
+	UNUSED_PARAM(p_block);
+	UNUSED_PARAM(block_num);
+	CL_ASSERT(FALSE);
+	return (IB_ERROR);
 }
+
 /*
 * PARAMETERS
 *	p_tbl
@@ -232,16 +227,16 @@ osm_rand_fwd_tbl_set_block(
 * SYNOPSIS
 */
 static inline uint8_t
-osm_rand_fwd_tbl_get(
-	IN const osm_rand_fwd_tbl_t* const p_tbl,
-	IN const uint16_t lid_ho )
+osm_rand_fwd_tbl_get(IN const osm_rand_fwd_tbl_t * const p_tbl,
+		     IN const uint16_t lid_ho)
 {
-	CL_ASSERT( FALSE );
-	UNUSED_PARAM( p_tbl );
-	UNUSED_PARAM( lid_ho );
+	CL_ASSERT(FALSE);
+	UNUSED_PARAM(p_tbl);
+	UNUSED_PARAM(lid_ho);
 
-	return( OSM_NO_PATH );
+	return (OSM_NO_PATH);
 }
+
 /*
 * PARAMETERS
 *	p_tbl
@@ -268,12 +263,12 @@ osm_rand_fwd_tbl_get(
 * SYNOPSIS
 */
 static inline uint16_t
-osm_rand_fwd_tbl_get_lids_per_block(
-	IN const osm_rand_fwd_tbl_t* const p_tbl )
+osm_rand_fwd_tbl_get_lids_per_block(IN const osm_rand_fwd_tbl_t * const p_tbl)
 {
-	UNUSED_PARAM( p_tbl );
-	return( 16 );
+	UNUSED_PARAM(p_tbl);
+	return (16);
 }
+
 /*
 * PARAMETERS
 *	p_tbl
@@ -297,15 +292,16 @@ osm_rand_fwd_tbl_get_lids_per_block(
 * SYNOPSIS
 */
 static inline uint16_t
-osm_rand_fwd_tbl_get_max_block_id_in_use(
-	IN const osm_rand_fwd_tbl_t* const p_tbl,
-	IN const uint16_t lid_top_ho )
+osm_rand_fwd_tbl_get_max_block_id_in_use(IN const osm_rand_fwd_tbl_t *
+					 const p_tbl,
+					 IN const uint16_t lid_top_ho)
 {
-	UNUSED_PARAM( p_tbl );
-	UNUSED_PARAM( lid_top_ho );
-	CL_ASSERT( FALSE );
-	return( 0 );
+	UNUSED_PARAM(p_tbl);
+	UNUSED_PARAM(lid_top_ho);
+	CL_ASSERT(FALSE);
+	return (0);
 }
+
 /*
 * PARAMETERS
 *	p_tbl
@@ -329,13 +325,13 @@ osm_rand_fwd_tbl_get_max_block_id_in_use(
 * SYNOPSIS
 */
 static inline uint16_t
-osm_rand_fwd_tbl_get_size(
-	IN const osm_rand_fwd_tbl_t* const p_tbl )
+osm_rand_fwd_tbl_get_size(IN const osm_rand_fwd_tbl_t * const p_tbl)
 {
-	UNUSED_PARAM( p_tbl );
-	CL_ASSERT( FALSE );
-	return( 0 );
+	UNUSED_PARAM(p_tbl);
+	CL_ASSERT(FALSE);
+	return (0);
 }
+
 /*
 * PARAMETERS
 *	p_tbl
@@ -350,5 +346,4 @@ osm_rand_fwd_tbl_get_size(
 *********/
 
 END_C_DECLS
-
-#endif	/* _OSM_RAND_FWD_TBL_H_ */
+#endif				/* _OSM_RAND_FWD_TBL_H_ */
diff --git a/opensm/include/opensm/osm_remote_sm.h b/opensm/include/opensm/osm_remote_sm.h
index e18e53b..4c5f67c 100644
--- a/opensm/include/opensm/osm_remote_sm.h
+++ b/opensm/include/opensm/osm_remote_sm.h
@@ -55,13 +55,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/Remote SM
 * NAME
 *	Remote SM
@@ -79,7 +78,6 @@ BEGIN_C_DECLS
 *	Steve King, Intel
 *
 *********/
-
 /****s* OpenSM: Remote SM/osm_remote_sm_t
 * NAME
 *	osm_remote_sm_t
@@ -92,11 +90,10 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_remote_sm
-{
-	cl_map_item_t				map_item;
-	const osm_port_t			*p_port;
-	ib_sm_info_t				smi;
+typedef struct _osm_remote_sm {
+	cl_map_item_t map_item;
+	const osm_port_t *p_port;
+	ib_sm_info_t smi;
 } osm_remote_sm_t;
 /*
 * FIELDS
@@ -120,9 +117,7 @@ typedef struct _osm_remote_sm
 *
 * SYNOPSIS
 */
-void
-osm_remote_sm_construct(
-	IN osm_remote_sm_t* const p_sm );
+void osm_remote_sm_construct(IN osm_remote_sm_t * const p_sm);
 /*
 * PARAMETERS
 *	p_sm
@@ -151,9 +146,7 @@ osm_remote_sm_construct(
 *
 * SYNOPSIS
 */
-void
-osm_remote_sm_destroy(
-	IN osm_remote_sm_t* const p_sm );
+void osm_remote_sm_destroy(IN osm_remote_sm_t * const p_sm);
 /*
 * PARAMETERS
 *	p_sm
@@ -182,10 +175,9 @@ osm_remote_sm_destroy(
 * SYNOPSIS
 */
 void
-osm_remote_sm_init(
-	IN osm_remote_sm_t* const p_sm,
-	IN const osm_port_t* const p_port,
-	IN const ib_sm_info_t* const p_smi );
+osm_remote_sm_init(IN osm_remote_sm_t * const p_sm,
+		   IN const osm_port_t * const p_port,
+		   IN const ib_sm_info_t * const p_smi);
 /*
 * PARAMETERS
 *	p_sm
@@ -208,5 +200,4 @@ osm_remote_sm_init(
 *********/
 
 END_C_DECLS
-
-#endif		/* _OSM_REMOTE_SM_H_ */
+#endif				/* _OSM_REMOTE_SM_H_ */
diff --git a/opensm/include/opensm/osm_req.h b/opensm/include/opensm/osm_req.h
index 21f281a..c4d8599 100644
--- a/opensm/include/opensm/osm_req.h
+++ b/opensm/include/opensm/osm_req.h
@@ -62,13 +62,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/Generic Requester
 * NAME
 *	Generic Requester
@@ -86,7 +85,6 @@ BEGIN_C_DECLS
 *	Steve King, Intel
 *
 *********/
-
 /****s* OpenSM: Generic Requester/osm_req_t
 * NAME
 *	osm_req_t
@@ -99,13 +97,12 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_req
-{
-	osm_mad_pool_t				*p_pool;
-	osm_vl15_t				*p_vl15;
-	osm_log_t				*p_log;
-	osm_subn_t				*p_subn;
-	atomic32_t				*p_sm_trans_id;
+typedef struct _osm_req {
+	osm_mad_pool_t *p_pool;
+	osm_vl15_t *p_vl15;
+	osm_log_t *p_log;
+	osm_subn_t *p_subn;
+	atomic32_t *p_sm_trans_id;
 
 } osm_req_t;
 /*
@@ -138,9 +135,7 @@ typedef struct _osm_req
 *
 * SYNOPSIS
 */
-void
-osm_req_construct(
-	IN osm_req_t* const p_req );
+void osm_req_construct(IN osm_req_t * const p_req);
 /*
 * PARAMETERS
 *	p_req
@@ -170,9 +165,7 @@ osm_req_construct(
 *
 * SYNOPSIS
 */
-void
-osm_req_destroy(
-	IN osm_req_t* const p_req );
+void osm_req_destroy(IN osm_req_t * const p_req);
 /*
 * PARAMETERS
 *	p_req
@@ -204,13 +197,11 @@ osm_req_destroy(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_req_init(
-	IN osm_req_t*				const p_req,
-	IN osm_mad_pool_t*			const p_pool,
-	IN osm_vl15_t*				const p_vl15,
-	IN osm_subn_t*				const p_subn,
-	IN osm_log_t*				const p_log,
-	IN atomic32_t*				const p_sm_trans_id );
+osm_req_init(IN osm_req_t * const p_req,
+	     IN osm_mad_pool_t * const p_pool,
+	     IN osm_vl15_t * const p_vl15,
+	     IN osm_subn_t * const p_subn,
+	     IN osm_log_t * const p_log, IN atomic32_t * const p_sm_trans_id);
 /*
 * PARAMETERS
 *	p_req
@@ -254,13 +245,12 @@ osm_req_init(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_req_get(
-	IN const osm_req_t* const p_req,
-	IN const osm_dr_path_t* const p_path,
-	IN const uint16_t attr_id,
-	IN const uint32_t attr_mod,
-	IN const cl_disp_msgid_t err_msg,
-	IN const osm_madw_context_t* const p_context );
+osm_req_get(IN const osm_req_t * const p_req,
+	    IN const osm_dr_path_t * const p_path,
+	    IN const uint16_t attr_id,
+	    IN const uint32_t attr_mod,
+	    IN const cl_disp_msgid_t err_msg,
+	    IN const osm_madw_context_t * const p_context);
 /*
 * PARAMETERS
 *	p_req
@@ -304,15 +294,14 @@ osm_req_get(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_req_set(
-	IN const osm_req_t* const p_req,
-	IN const osm_dr_path_t* const p_path,
-	IN const uint8_t* const p_payload,
-	IN const size_t payload_size,
-	IN const uint16_t attr_id,
-	IN const uint32_t attr_mod,
-	IN const cl_disp_msgid_t err_msg,
-	IN const osm_madw_context_t* const p_context );
+osm_req_set(IN const osm_req_t * const p_req,
+	    IN const osm_dr_path_t * const p_path,
+	    IN const uint8_t * const p_payload,
+	    IN const size_t payload_size,
+	    IN const uint16_t attr_id,
+	    IN const uint32_t attr_mod,
+	    IN const cl_disp_msgid_t err_msg,
+	    IN const osm_madw_context_t * const p_context);
 /*
 * PARAMETERS
 *	p_req
@@ -353,5 +342,4 @@ osm_req_set(
 *********/
 
 END_C_DECLS
-
-#endif	/* _OSM_REQ_H_ */
+#endif				/* _OSM_REQ_H_ */
diff --git a/opensm/include/opensm/osm_resp.h b/opensm/include/opensm/osm_resp.h
index f280c00..5f1060e 100644
--- a/opensm/include/opensm/osm_resp.h
+++ b/opensm/include/opensm/osm_resp.h
@@ -62,13 +62,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/Generic Responder
 * NAME
 *	Generic Responder
@@ -86,7 +85,6 @@ BEGIN_C_DECLS
 *	Steve King, Intel
 *
 *********/
-
 /****s* OpenSM: Generic Responder/osm_resp_t
 * NAME
 *	osm_resp_t
@@ -99,12 +97,11 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_resp
-{
-	osm_mad_pool_t				*p_pool;
-	osm_vl15_t				*p_vl15;
-	osm_log_t				*p_log;
-	osm_subn_t				*p_subn;
+typedef struct _osm_resp {
+	osm_mad_pool_t *p_pool;
+	osm_vl15_t *p_vl15;
+	osm_log_t *p_log;
+	osm_subn_t *p_subn;
 
 } osm_resp_t;
 /*
@@ -134,9 +131,7 @@ typedef struct _osm_resp
 *
 * SYNOPSIS
 */
-void
-osm_resp_construct(
-	IN osm_resp_t* const p_resp );
+void osm_resp_construct(IN osm_resp_t * const p_resp);
 /*
 * PARAMETERS
 *	p_resp
@@ -166,9 +161,7 @@ osm_resp_construct(
 *
 * SYNOPSIS
 */
-void
-osm_resp_destroy(
-	IN osm_resp_t* const p_resp );
+void osm_resp_destroy(IN osm_resp_t * const p_resp);
 /*
 * PARAMETERS
 *	p_resp
@@ -200,12 +193,10 @@ osm_resp_destroy(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_resp_init(
-	IN osm_resp_t*				const p_resp,
-	IN osm_mad_pool_t*			const p_pool,
-	IN osm_vl15_t*				const p_vl15,
-	IN osm_subn_t*				const p_subn,
-	IN osm_log_t*				const p_log );
+osm_resp_init(IN osm_resp_t * const p_resp,
+	      IN osm_mad_pool_t * const p_pool,
+	      IN osm_vl15_t * const p_vl15,
+	      IN osm_subn_t * const p_subn, IN osm_log_t * const p_log);
 /*
 * PARAMETERS
 *	p_resp
@@ -245,11 +236,9 @@ osm_resp_init(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_resp_send(
-	IN const osm_resp_t* const p_resp,
-	IN const osm_madw_t* const p_req_madw,
-	IN const ib_net16_t status,
-	IN const uint8_t* const p_payload );
+osm_resp_send(IN const osm_resp_t * const p_resp,
+	      IN const osm_madw_t * const p_req_madw,
+	      IN const ib_net16_t status, IN const uint8_t * const p_payload);
 /*
 * PARAMETERS
 *	p_resp
@@ -275,5 +264,4 @@ osm_resp_send(
 *********/
 
 END_C_DECLS
-
-#endif	/* _OSM_RESP_H_ */
+#endif				/* _OSM_RESP_H_ */
diff --git a/opensm/include/opensm/osm_router.h b/opensm/include/opensm/osm_router.h
index 65cf304..e7d2294 100644
--- a/opensm/include/opensm/osm_router.h
+++ b/opensm/include/opensm/osm_router.h
@@ -59,13 +59,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/Router
 * NAME
 *	Router
@@ -85,7 +84,6 @@ BEGIN_C_DECLS
 *	Hal Rosenstock, Voltaire
 *
 *********/
-
 /****s* OpenSM: Router/osm_router_t
 * NAME
 *	osm_router_t
@@ -98,10 +96,9 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_router
-{
-	cl_map_item_t	map_item;
-	osm_port_t	*p_port;
+typedef struct _osm_router {
+	cl_map_item_t map_item;
+	osm_port_t *p_port;
 } osm_router_t;
 /*
 * FIELDS
@@ -124,9 +121,7 @@ typedef struct _osm_router
 *
 * SYNOPSIS
 */
-void
-osm_router_delete(
-	IN OUT osm_router_t** const pp_rtr );
+void osm_router_delete(IN OUT osm_router_t ** const pp_rtr);
 /*
 * PARAMETERS
 *	p_rtr
@@ -150,9 +145,7 @@ osm_router_delete(
 *
 * SYNOPSIS
 */
-osm_router_t*
-osm_router_new(
-	IN osm_port_t* const p_port );
+osm_router_t *osm_router_new(IN osm_port_t * const p_port);
 /*
 * PARAMETERS
 *	p_node
@@ -176,12 +169,12 @@ osm_router_new(
 *
 * SYNOPSIS
 */
-static inline osm_port_t*
-osm_router_get_port_ptr(
-        IN const osm_router_t* const p_rtr )
+static inline osm_port_t *osm_router_get_port_ptr(IN const osm_router_t *
+						  const p_rtr)
 {
-        return( p_rtr->p_port );
+	return (p_rtr->p_port);
 }
+
 /*
 * PARAMETERS
 *	p_rtr
@@ -205,12 +198,12 @@ osm_router_get_port_ptr(
 *
 * SYNOPSIS
 */
-static inline osm_node_t*
-osm_router_get_node_ptr(
-	IN const osm_router_t* const p_rtr )
+static inline osm_node_t *osm_router_get_node_ptr(IN const osm_router_t *
+						  const p_rtr)
 {
-	return( p_rtr->p_port->p_node );
+	return (p_rtr->p_port->p_node);
 }
+
 /*
 * PARAMETERS
 *	p_rtr
@@ -226,5 +219,4 @@ osm_router_get_node_ptr(
 *********/
 
 END_C_DECLS
-
-#endif /* _OSM_ROUTER_H_ */
+#endif				/* _OSM_ROUTER_H_ */
diff --git a/opensm/include/opensm/osm_sa.h b/opensm/include/opensm/osm_sa.h
index 85d1ae0..34c66b5 100644
--- a/opensm/include/opensm/osm_sa.h
+++ b/opensm/include/opensm/osm_sa.h
@@ -82,13 +82,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/SA
 * NAME
 *	SA
@@ -108,7 +107,6 @@ BEGIN_C_DECLS
 *	Anil Keshavamurthy, Intel
 *
 *********/
-
 /****d* OpenSM: SA/osm_sa_state_t
 * NAME
 *	osm_sa_state_t
@@ -118,11 +116,9 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef enum _osm_sa_state
-{
+typedef enum _osm_sa_state {
 	OSM_SA_STATE_INIT = 0,
 	OSM_SA_STATE_READY
-
 } osm_sa_state_t;
 /***********/
 
@@ -138,72 +134,71 @@ typedef enum _osm_sa_state
 *
 * SYNOPSIS
 */
-typedef struct _osm_sa
-{
-	osm_sa_state_t				state;
-	osm_subn_t				*p_subn;
-	osm_vendor_t				*p_vendor;
-	osm_log_t				*p_log;
-	osm_mad_pool_t				*p_mad_pool;
-	cl_dispatcher_t				*p_disp;
-	cl_plock_t				*p_lock;
-	atomic32_t				sa_trans_id;
-	osm_sa_mad_ctrl_t			mad_ctrl;
-	osm_sa_resp_t				resp;
-	osm_cpi_rcv_t				cpi_rcv;
-	osm_nr_rcv_t				nr_rcv;
-	osm_pir_rcv_t				pir_rcv;
-	osm_gir_rcv_t				gir_rcv;
-	osm_lr_rcv_t				lr_rcv;
-	osm_pr_rcv_t				pr_rcv;
-	osm_smir_rcv_t				smir_rcv;
-	osm_mcmr_recv_t				mcmr_rcv;
-	osm_sr_rcv_t				sr_rcv;
+typedef struct _osm_sa {
+	osm_sa_state_t state;
+	osm_subn_t *p_subn;
+	osm_vendor_t *p_vendor;
+	osm_log_t *p_log;
+	osm_mad_pool_t *p_mad_pool;
+	cl_dispatcher_t *p_disp;
+	cl_plock_t *p_lock;
+	atomic32_t sa_trans_id;
+	osm_sa_mad_ctrl_t mad_ctrl;
+	osm_sa_resp_t resp;
+	osm_cpi_rcv_t cpi_rcv;
+	osm_nr_rcv_t nr_rcv;
+	osm_pir_rcv_t pir_rcv;
+	osm_gir_rcv_t gir_rcv;
+	osm_lr_rcv_t lr_rcv;
+	osm_pr_rcv_t pr_rcv;
+	osm_smir_rcv_t smir_rcv;
+	osm_mcmr_recv_t mcmr_rcv;
+	osm_sr_rcv_t sr_rcv;
 #if defined (VENDOR_RMPP_SUPPORT) && defined (DUAL_SIDED_RMPP)
-	osm_mpr_rcv_t				mpr_rcv;
+	osm_mpr_rcv_t mpr_rcv;
 #endif
 
 	/* InformInfo Receiver */
-	osm_infr_rcv_t				infr_rcv;
+	osm_infr_rcv_t infr_rcv;
 
 	/* VL Arbitrartion Query */
-	osm_vlarb_rec_rcv_t			vlarb_rec_rcv;
+	osm_vlarb_rec_rcv_t vlarb_rec_rcv;
 
 	/* SLtoVL Map Query */
-	osm_slvl_rec_rcv_t			slvl_rec_rcv;
+	osm_slvl_rec_rcv_t slvl_rec_rcv;
 
 	/* P_Key table Query */
-	osm_pkey_rec_rcv_t			pkey_rec_rcv;
+	osm_pkey_rec_rcv_t pkey_rec_rcv;
 
 	/* LinearForwardingTable Query */
-	osm_lftr_rcv_t				lftr_rcv;
+	osm_lftr_rcv_t lftr_rcv;
 
 	/* SwitchInfo Query */
-	osm_sir_rcv_t				sir_rcv;
+	osm_sir_rcv_t sir_rcv;
 
 	/* MulticastForwardingTable Query */
-	osm_mftr_rcv_t				mftr_rcv;
+	osm_mftr_rcv_t mftr_rcv;
 
-	cl_disp_reg_handle_t			cpi_disp_h;
-	cl_disp_reg_handle_t			nr_disp_h;
-	cl_disp_reg_handle_t			pir_disp_h;
-	cl_disp_reg_handle_t			gir_disp_h;
-	cl_disp_reg_handle_t			lr_disp_h;
-	cl_disp_reg_handle_t			pr_disp_h;
-	cl_disp_reg_handle_t			smir_disp_h;
-	cl_disp_reg_handle_t			mcmr_disp_h;
-	cl_disp_reg_handle_t			sr_disp_h;
+	cl_disp_reg_handle_t cpi_disp_h;
+	cl_disp_reg_handle_t nr_disp_h;
+	cl_disp_reg_handle_t pir_disp_h;
+	cl_disp_reg_handle_t gir_disp_h;
+	cl_disp_reg_handle_t lr_disp_h;
+	cl_disp_reg_handle_t pr_disp_h;
+	cl_disp_reg_handle_t smir_disp_h;
+	cl_disp_reg_handle_t mcmr_disp_h;
+	cl_disp_reg_handle_t sr_disp_h;
 #if defined (VENDOR_RMPP_SUPPORT) && defined (DUAL_SIDED_RMPP)
-	cl_disp_reg_handle_t			mpr_disp_h;
+	cl_disp_reg_handle_t mpr_disp_h;
 #endif
-	cl_disp_reg_handle_t			infr_disp_h;
-	cl_disp_reg_handle_t			infir_disp_h;
-	cl_disp_reg_handle_t			vlarb_disp_h;
-	cl_disp_reg_handle_t			slvl_disp_h;
-	cl_disp_reg_handle_t			pkey_disp_h;
-	cl_disp_reg_handle_t			lft_disp_h;
-	cl_disp_reg_handle_t			sir_disp_h;
-	cl_disp_reg_handle_t			mft_disp_h;
+	cl_disp_reg_handle_t infr_disp_h;
+	cl_disp_reg_handle_t infir_disp_h;
+	cl_disp_reg_handle_t vlarb_disp_h;
+	cl_disp_reg_handle_t slvl_disp_h;
+	cl_disp_reg_handle_t pkey_disp_h;
+	cl_disp_reg_handle_t lft_disp_h;
+	cl_disp_reg_handle_t sir_disp_h;
+	cl_disp_reg_handle_t mft_disp_h;
 } osm_sa_t;
 /*
 * FIELDS
@@ -259,8 +254,7 @@ typedef struct _osm_sa
 *
 * SYNOPSIS
 */
-void osm_sa_construct(
-	IN osm_sa_t* const p_sa );
+void osm_sa_construct(IN osm_sa_t * const p_sa);
 /*
 * PARAMETERS
 *	p_sa
@@ -289,8 +283,7 @@ void osm_sa_construct(
 *
 * SYNOPSIS
 */
-void osm_sa_shutdown(
-	IN osm_sa_t* const p_sa );
+void osm_sa_shutdown(IN osm_sa_t * const p_sa);
 /*
 * PARAMETERS
 *	p_sa
@@ -313,8 +306,7 @@ void osm_sa_shutdown(
 *
 * SYNOPSIS
 */
-void osm_sa_destroy(
-	IN osm_sa_t* const p_sa );
+void osm_sa_destroy(IN osm_sa_t * const p_sa);
 /*
 * PARAMETERS
 *	p_sa
@@ -342,16 +334,15 @@ void osm_sa_destroy(
 *
 * SYNOPSIS
 */
-ib_api_status_t osm_sa_init(
-	IN osm_sm_t* const p_sm,
-	IN osm_sa_t* const p_sa,
-	IN osm_subn_t* const p_subn,
-	IN osm_vendor_t* const p_vendor,
-	IN osm_mad_pool_t* const p_mad_pool,
-	IN osm_log_t* const p_log,
-	IN osm_stats_t*	const p_stats,
-	IN cl_dispatcher_t* const p_disp,
-	IN cl_plock_t* const p_lock );
+ib_api_status_t osm_sa_init(IN osm_sm_t * const p_sm,
+			    IN osm_sa_t * const p_sa,
+			    IN osm_subn_t * const p_subn,
+			    IN osm_vendor_t * const p_vendor,
+			    IN osm_mad_pool_t * const p_mad_pool,
+			    IN osm_log_t * const p_log,
+			    IN osm_stats_t * const p_stats,
+			    IN cl_dispatcher_t * const p_disp,
+			    IN cl_plock_t * const p_lock);
 /*
 * PARAMETERS
 *	p_sa
@@ -398,8 +389,7 @@ ib_api_status_t osm_sa_init(
 *
 * SYNOPSIS
 */
-boolean_t osm_sa_is_inited(
-	IN const osm_sa_t* const p_sa );
+boolean_t osm_sa_is_inited(IN const osm_sa_t * const p_sa);
 /*
 * PARAMETERS
 *	p_sa
@@ -427,9 +417,7 @@ boolean_t osm_sa_is_inited(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_sa_bind(
-	IN osm_sa_t* const p_sa,
-	IN const ib_net64_t port_guid );
+osm_sa_bind(IN osm_sa_t * const p_sa, IN const ib_net64_t port_guid);
 /*
 * PARAMETERS
 *	p_sa
@@ -490,5 +478,4 @@ int osm_sa_db_file_load(struct _osm_opensm_t *p_osm);
 *********/
 
 END_C_DECLS
-
-#endif		/* _OSM_SA_H_ */
+#endif				/* _OSM_SA_H_ */
diff --git a/opensm/include/opensm/osm_sa_class_port_info.h b/opensm/include/opensm/osm_sa_class_port_info.h
index ca159a2..b477cd5 100644
--- a/opensm/include/opensm/osm_sa_class_port_info.h
+++ b/opensm/include/opensm/osm_sa_class_port_info.h
@@ -61,13 +61,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/ClassPort Info Receiver
 * NAME
 *	ClassPort Info Receiver
@@ -85,7 +84,6 @@ BEGIN_C_DECLS
 *	Eitan Zahavi, Mellanox
 *
 *********/
-
 /****s* OpenSM: ClassPort Info Receiver/osm_cpi_rcv_t
 * NAME
 *	osm_cpi_rcv_t
@@ -98,13 +96,12 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_cpi_rcv
-{
-	osm_subn_t	*p_subn;
-	osm_sa_resp_t	*p_resp;
-	osm_mad_pool_t	*p_mad_pool;
-	osm_log_t	*p_log;
-	cl_plock_t	*p_lock;
+typedef struct _osm_cpi_rcv {
+	osm_subn_t *p_subn;
+	osm_sa_resp_t *p_resp;
+	osm_mad_pool_t *p_mad_pool;
+	osm_log_t *p_log;
+	cl_plock_t *p_lock;
 } osm_cpi_rcv_t;
 /*
 * FIELDS
@@ -133,9 +130,7 @@ typedef struct _osm_cpi_rcv
 *
 * SYNOPSIS
 */
-void
-osm_cpi_rcv_construct(
-	IN osm_cpi_rcv_t* const p_rcv );
+void osm_cpi_rcv_construct(IN osm_cpi_rcv_t * const p_rcv);
 /*
 * PARAMETERS
 *	p_rcv
@@ -164,9 +159,7 @@ osm_cpi_rcv_construct(
 *
 * SYNOPSIS
 */
-void
-osm_cpi_rcv_destroy(
-	IN osm_cpi_rcv_t* const p_rcv );
+void osm_cpi_rcv_destroy(IN osm_cpi_rcv_t * const p_rcv);
 /*
 * PARAMETERS
 *	p_rcv
@@ -198,13 +191,11 @@ osm_cpi_rcv_destroy(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_cpi_rcv_init(
-	IN osm_cpi_rcv_t* const p_rcv,
-	IN osm_sa_resp_t* const p_resp,
-	IN osm_mad_pool_t* const p_mad_pool,
-	IN osm_subn_t* const p_subn,
-	IN osm_log_t* const p_log,
-	IN cl_plock_t* const p_lock );
+osm_cpi_rcv_init(IN osm_cpi_rcv_t * const p_rcv,
+		 IN osm_sa_resp_t * const p_resp,
+		 IN osm_mad_pool_t * const p_mad_pool,
+		 IN osm_subn_t * const p_subn,
+		 IN osm_log_t * const p_log, IN cl_plock_t * const p_lock);
 /*
 * PARAMETERS
 *	p_rcv
@@ -240,10 +231,7 @@ osm_cpi_rcv_init(
 *
 * SYNOPSIS
 */
-void
-osm_cpi_rcv_process(
-	IN void *context,
-	IN void *data );
+void osm_cpi_rcv_process(IN void *context, IN void *data);
 /*
 * PARAMETERS
 *	context
@@ -264,5 +252,4 @@ osm_cpi_rcv_process(
 *********/
 
 END_C_DECLS
-
-#endif	/* _OSM_CPI_H_ */
+#endif				/* _OSM_CPI_H_ */
diff --git a/opensm/include/opensm/osm_sa_guidinfo_record.h b/opensm/include/opensm/osm_sa_guidinfo_record.h
index e80f27d..dcdf896 100644
--- a/opensm/include/opensm/osm_sa_guidinfo_record.h
+++ b/opensm/include/opensm/osm_sa_guidinfo_record.h
@@ -59,13 +59,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/GUIDInfo Record Receiver
 * NAME
 *	GUIDInfo Record Receiver
@@ -83,7 +82,6 @@ BEGIN_C_DECLS
 *	Hal Rosenstock, Voltaire
 *
 *********/
-
 /****s* OpenSM: GUIDInfo Record Receiver/osm_gir_rcv_t
 * NAME
 *	osm_gir_rcv_t
@@ -96,14 +94,13 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_gir_rcv
-{
-	const osm_subn_t	*p_subn;
-	osm_sa_resp_t		*p_resp;
-	osm_mad_pool_t		*p_mad_pool;
-	osm_log_t		*p_log;
-	cl_plock_t		*p_lock;
-	cl_qlock_pool_t		pool;
+typedef struct _osm_gir_rcv {
+	const osm_subn_t *p_subn;
+	osm_sa_resp_t *p_resp;
+	osm_mad_pool_t *p_mad_pool;
+	osm_log_t *p_log;
+	cl_plock_t *p_lock;
+	cl_qlock_pool_t pool;
 } osm_gir_rcv_t;
 /*
 * FIELDS
@@ -139,9 +136,7 @@ typedef struct _osm_gir_rcv
 *
 * SYNOPSIS
 */
-void
-osm_gir_rcv_construct(
-	IN osm_gir_rcv_t* const p_rcv );
+void osm_gir_rcv_construct(IN osm_gir_rcv_t * const p_rcv);
 /*
 * PARAMETERS
 *	p_rcv
@@ -171,9 +166,7 @@ osm_gir_rcv_construct(
 *
 * SYNOPSIS
 */
-void
-osm_gir_rcv_destroy(
-	IN osm_gir_rcv_t* const p_rcv );
+void osm_gir_rcv_destroy(IN osm_gir_rcv_t * const p_rcv);
 /*
 * PARAMETERS
 *	p_rcv
@@ -205,13 +198,11 @@ osm_gir_rcv_destroy(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_gir_rcv_init(
-	IN osm_gir_rcv_t* const p_rcv,
-	IN osm_sa_resp_t* const p_resp,
-	IN osm_mad_pool_t* const p_mad_pool,
-	IN const osm_subn_t* const p_subn,
-	IN osm_log_t* const p_log,
-	IN cl_plock_t* const p_lock );
+osm_gir_rcv_init(IN osm_gir_rcv_t * const p_rcv,
+		 IN osm_sa_resp_t * const p_resp,
+		 IN osm_mad_pool_t * const p_mad_pool,
+		 IN const osm_subn_t * const p_subn,
+		 IN osm_log_t * const p_log, IN cl_plock_t * const p_lock);
 /*
 * PARAMETERS
 *	p_rcv
@@ -250,10 +241,7 @@ osm_gir_rcv_init(
 *
 * SYNOPSIS
 */
-void
-osm_gir_rcv_process(
-	IN void *context,
-	IN void *data );
+void osm_gir_rcv_process(IN void *context, IN void *data);
 /*
 * PARAMETERS
 *	context
@@ -274,5 +262,4 @@ osm_gir_rcv_process(
 *********/
 
 END_C_DECLS
-
-#endif	/* _OSM_GIR_RCV_H_ */
+#endif				/* _OSM_GIR_RCV_H_ */
diff --git a/opensm/include/opensm/osm_sa_informinfo.h b/opensm/include/opensm/osm_sa_informinfo.h
index c935995..5d00dd6 100644
--- a/opensm/include/opensm/osm_sa_informinfo.h
+++ b/opensm/include/opensm/osm_sa_informinfo.h
@@ -63,13 +63,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/InformInfo Receiver
 * NAME
 *	InformInfo Receiver
@@ -87,7 +86,6 @@ BEGIN_C_DECLS
 *	Eitan Zahavi, Mellanox
 *
 *********/
-
 /****s* OpenSM: InformInfo Receiver/osm_infr_rcv_t
 * NAME
 *	osm_infr_rcv_t
@@ -100,14 +98,13 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_infr_rcv
-{
-	osm_subn_t	*p_subn;
-	osm_sa_resp_t	*p_resp;
-	osm_mad_pool_t	*p_mad_pool;
-	osm_log_t	*p_log;
-	cl_plock_t	*p_lock;
-	cl_qlock_pool_t	pool;
+typedef struct _osm_infr_rcv {
+	osm_subn_t *p_subn;
+	osm_sa_resp_t *p_resp;
+	osm_mad_pool_t *p_mad_pool;
+	osm_log_t *p_log;
+	cl_plock_t *p_lock;
+	cl_qlock_pool_t pool;
 } osm_infr_rcv_t;
 /*
 * FIELDS
@@ -140,9 +137,7 @@ typedef struct _osm_infr_rcv
 *
 * SYNOPSIS
 */
-void
-osm_infr_rcv_construct(
-	IN osm_infr_rcv_t* const p_rcv );
+void osm_infr_rcv_construct(IN osm_infr_rcv_t * const p_rcv);
 /*
 * PARAMETERS
 *	p_rcv
@@ -171,9 +166,7 @@ osm_infr_rcv_construct(
 *
 * SYNOPSIS
 */
-void
-osm_infr_rcv_destroy(
-	IN osm_infr_rcv_t* const p_rcv );
+void osm_infr_rcv_destroy(IN osm_infr_rcv_t * const p_rcv);
 /*
 * PARAMETERS
 *	p_rcv
@@ -205,13 +198,11 @@ osm_infr_rcv_destroy(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_infr_rcv_init(
-	IN osm_infr_rcv_t* const p_rcv,
-	IN osm_sa_resp_t* const p_resp,
-	IN osm_mad_pool_t* const p_mad_pool,
-	IN osm_subn_t* const p_subn,
-	IN osm_log_t* const p_log,
-	IN cl_plock_t* const p_lock );
+osm_infr_rcv_init(IN osm_infr_rcv_t * const p_rcv,
+		  IN osm_sa_resp_t * const p_resp,
+		  IN osm_mad_pool_t * const p_mad_pool,
+		  IN osm_subn_t * const p_subn,
+		  IN osm_log_t * const p_log, IN cl_plock_t * const p_lock);
 /*
 * PARAMETERS
 *	p_rcv
@@ -247,10 +238,7 @@ osm_infr_rcv_init(
 *
 * SYNOPSIS
 */
-void
-osm_infr_rcv_process(
-	IN void *context,
-	IN void *data );
+void osm_infr_rcv_process(IN void *context, IN void *data);
 /*
 * PARAMETERS
 *	context
@@ -275,10 +263,7 @@ osm_infr_rcv_process(
 *
 * SYNOPSIS
 */
-void
-osm_infir_rcv_process(
-	IN void *context,
-	IN void *data );
+void osm_infir_rcv_process(IN void *context, IN void *data);
 /*
 * PARAMETERS
 *	context
@@ -295,5 +280,4 @@ osm_infir_rcv_process(
 *********/
 
 END_C_DECLS
-
-#endif	/* _OSM_SA_INFR_H_ */
+#endif				/* _OSM_SA_INFR_H_ */
diff --git a/opensm/include/opensm/osm_sa_lft_record.h b/opensm/include/opensm/osm_sa_lft_record.h
index 4361d2d..18a43f4 100644
--- a/opensm/include/opensm/osm_sa_lft_record.h
+++ b/opensm/include/opensm/osm_sa_lft_record.h
@@ -61,13 +61,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/Linear Forwarding Table Receiver
 * NAME
 *	Linear Forwarding Table Receiver
@@ -85,7 +84,6 @@ BEGIN_C_DECLS
 *	Eitan Zahavi, Mellanox Technologies LTD
 *
 *********/
-
 /****s* OpenSM: Linear Forwarding Table Receiver/osm_lftr_rcv_t
 * NAME
 *	osm_lftr_rcv_t
@@ -98,15 +96,14 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_lft
-{
-	osm_subn_t*	p_subn;
-	osm_stats_t*	p_stats;
-	osm_sa_resp_t*	p_resp;
-	osm_mad_pool_t*	p_mad_pool;
-	osm_log_t*	p_log;
-	cl_plock_t*	p_lock;
-	cl_qlock_pool_t	pool;
+typedef struct _osm_lft {
+	osm_subn_t *p_subn;
+	osm_stats_t *p_stats;
+	osm_sa_resp_t *p_resp;
+	osm_mad_pool_t *p_mad_pool;
+	osm_log_t *p_log;
+	cl_plock_t *p_lock;
+	cl_qlock_pool_t pool;
 } osm_lftr_rcv_t;
 /*
 * FIELDS
@@ -145,8 +142,7 @@ typedef struct _osm_lft
 *
 * SYNOPSIS
 */
-void osm_lftr_rcv_construct(
-	IN osm_lftr_rcv_t* const p_ctrl );
+void osm_lftr_rcv_construct(IN osm_lftr_rcv_t * const p_ctrl);
 /*
 * PARAMETERS
 *	p_ctrl
@@ -176,8 +172,7 @@ void osm_lftr_rcv_construct(
 *
 * SYNOPSIS
 */
-void osm_lftr_rcv_destroy(
-	IN osm_lftr_rcv_t* const p_ctrl );
+void osm_lftr_rcv_destroy(IN osm_lftr_rcv_t * const p_ctrl);
 /*
 * PARAMETERS
 *	p_ctrl
@@ -208,13 +203,12 @@ void osm_lftr_rcv_destroy(
 *
 * SYNOPSIS
 */
-ib_api_status_t osm_lftr_rcv_init(
-	IN osm_lftr_rcv_t* const p_rcv,
-	IN osm_sa_resp_t* const p_resp,
-	IN osm_mad_pool_t* const p_mad_pool,
-	IN osm_subn_t* const p_subn,
-	IN osm_log_t* const p_log,
-	IN cl_plock_t* const p_lock );
+ib_api_status_t osm_lftr_rcv_init(IN osm_lftr_rcv_t * const p_rcv,
+				  IN osm_sa_resp_t * const p_resp,
+				  IN osm_mad_pool_t * const p_mad_pool,
+				  IN osm_subn_t * const p_subn,
+				  IN osm_log_t * const p_log,
+				  IN cl_plock_t * const p_lock);
 /*
 * PARAMETERS
 *	p_rcv
@@ -253,9 +247,7 @@ ib_api_status_t osm_lftr_rcv_init(
 *
 * SYNOPSIS
 */
-void osm_lftr_rcv_process(
-	IN void *context,
-	IN void *data );
+void osm_lftr_rcv_process(IN void *context, IN void *data);
 /*
 * PARAMETERS
 *	context
@@ -277,5 +269,4 @@ void osm_lftr_rcv_process(
 *********/
 
 END_C_DECLS
-
-#endif	/* _OSM_LFTR_H_ */
+#endif				/* _OSM_LFTR_H_ */
diff --git a/opensm/include/opensm/osm_sa_link_record.h b/opensm/include/opensm/osm_sa_link_record.h
index adc3be8..3104704 100644
--- a/opensm/include/opensm/osm_sa_link_record.h
+++ b/opensm/include/opensm/osm_sa_link_record.h
@@ -61,13 +61,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/Link Record Receiver
 * NAME
 *	Link Record Receiver
@@ -85,7 +84,6 @@ BEGIN_C_DECLS
 *	Ranjit Pandit, Intel
 *
 *********/
-
 /****s* OpenSM: Link Record Receiver/osm_lr_rcv_t
 * NAME
 *	osm_lr_rcv_t
@@ -98,14 +96,13 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_lr_rcv
-{
-	osm_subn_t	*p_subn;
-	osm_sa_resp_t	*p_resp;
-	osm_mad_pool_t	*p_mad_pool;
-	osm_log_t	*p_log;
-	cl_plock_t	*p_lock;
-	cl_qlock_pool_t	lr_pool;
+typedef struct _osm_lr_rcv {
+	osm_subn_t *p_subn;
+	osm_sa_resp_t *p_resp;
+	osm_mad_pool_t *p_mad_pool;
+	osm_log_t *p_log;
+	cl_plock_t *p_lock;
+	cl_qlock_pool_t lr_pool;
 } osm_lr_rcv_t;
 /*
 * FIELDS
@@ -139,9 +136,7 @@ typedef struct _osm_lr_rcv
 *
 * SYNOPSIS
 */
-void
-osm_lr_rcv_construct(
-	IN osm_lr_rcv_t* const p_rcv );
+void osm_lr_rcv_construct(IN osm_lr_rcv_t * const p_rcv);
 /*
 * PARAMETERS
 *	p_rcv
@@ -170,9 +165,7 @@ osm_lr_rcv_construct(
 *
 * SYNOPSIS
 */
-void
-osm_lr_rcv_destroy(
-	IN osm_lr_rcv_t* const p_rcv );
+void osm_lr_rcv_destroy(IN osm_lr_rcv_t * const p_rcv);
 /*
 * PARAMETERS
 *	p_rcv
@@ -204,13 +197,11 @@ osm_lr_rcv_destroy(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_lr_rcv_init(
-	IN osm_lr_rcv_t* const p_rcv,
-	IN osm_sa_resp_t* const p_resp,
-	IN osm_mad_pool_t* const p_mad_pool,
-	IN osm_subn_t* const p_subn,
-	IN osm_log_t* const p_log,
-	IN cl_plock_t* const p_lock );
+osm_lr_rcv_init(IN osm_lr_rcv_t * const p_rcv,
+		IN osm_sa_resp_t * const p_resp,
+		IN osm_mad_pool_t * const p_mad_pool,
+		IN osm_subn_t * const p_subn,
+		IN osm_log_t * const p_log, IN cl_plock_t * const p_lock);
 /*
 * PARAMETERS
 *	p_rcv
@@ -251,9 +242,7 @@ osm_lr_rcv_init(
 *
 * SYNOPSIS
 */
-void osm_lr_rcv_process(
-	IN void *context,
-	IN void *data );
+void osm_lr_rcv_process(IN void *context, IN void *data);
 /*
 * PARAMETERS
 *	context
@@ -271,5 +260,4 @@ void osm_lr_rcv_process(
 *********/
 
 END_C_DECLS
-
-#endif	/* _OSM_LR_RCV_H_ */
+#endif				/* _OSM_LR_RCV_H_ */
diff --git a/opensm/include/opensm/osm_sa_mad_ctrl.h b/opensm/include/opensm/osm_sa_mad_ctrl.h
index ca99f25..bd7751e 100644
--- a/opensm/include/opensm/osm_sa_mad_ctrl.h
+++ b/opensm/include/opensm/osm_sa_mad_ctrl.h
@@ -60,13 +60,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/SA MAD Controller
 * NAME
 *	SA MAD Controller
@@ -84,7 +83,6 @@ BEGIN_C_DECLS
 *	Ranjit Pandit, Intel
 *
 *********/
-
 /****s* OpenSM: SA MAD Controller/osm_sa_mad_ctrl_t
 * NAME
 *	osm_sa_mad_ctrl_t
@@ -97,17 +95,16 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_sa_mad_ctrl
-{
-  osm_log_t             *p_log;
-  osm_mad_pool_t        *p_mad_pool;
-  osm_vendor_t          *p_vendor;
-  osm_bind_handle_t      h_bind;
-  cl_dispatcher_t       *p_disp;
-  cl_disp_reg_handle_t   h_disp;
-  osm_stats_t           *p_stats;
-  osm_subn_t            *p_subn;
-  osm_sa_resp_t         *p_resp;
+typedef struct _osm_sa_mad_ctrl {
+	osm_log_t *p_log;
+	osm_mad_pool_t *p_mad_pool;
+	osm_vendor_t *p_vendor;
+	osm_bind_handle_t h_bind;
+	cl_dispatcher_t *p_disp;
+	cl_disp_reg_handle_t h_disp;
+	osm_stats_t *p_stats;
+	osm_subn_t *p_subn;
+	osm_sa_resp_t *p_resp;
 } osm_sa_mad_ctrl_t;
 /*
 * FIELDS
@@ -149,8 +146,7 @@ typedef struct _osm_sa_mad_ctrl
 *
 * SYNOPSIS
 */
-void osm_sa_mad_ctrl_construct(
-	IN osm_sa_mad_ctrl_t* const p_ctrl );
+void osm_sa_mad_ctrl_construct(IN osm_sa_mad_ctrl_t * const p_ctrl);
 /*
 * PARAMETERS
 *	p_ctrl
@@ -181,8 +177,7 @@ void osm_sa_mad_ctrl_construct(
 *
 * SYNOPSIS
 */
-void osm_sa_mad_ctrl_destroy(
-	IN osm_sa_mad_ctrl_t* const p_ctrl );
+void osm_sa_mad_ctrl_destroy(IN osm_sa_mad_ctrl_t * const p_ctrl);
 /*
 * PARAMETERS
 *	p_ctrl
@@ -213,15 +208,14 @@ void osm_sa_mad_ctrl_destroy(
 *
 * SYNOPSIS
 */
-ib_api_status_t osm_sa_mad_ctrl_init(
-	IN osm_sa_mad_ctrl_t* const p_ctrl,
-   IN osm_sa_resp_t*     const p_resp,
-	IN osm_mad_pool_t* const p_mad_pool,
-	IN osm_vendor_t* const p_vendor,
-	IN osm_subn_t* const p_subn,
-	IN osm_log_t* const p_log,
-	IN osm_stats_t* const p_stats,
-	IN cl_dispatcher_t* const p_disp );
+ib_api_status_t osm_sa_mad_ctrl_init(IN osm_sa_mad_ctrl_t * const p_ctrl,
+				     IN osm_sa_resp_t * const p_resp,
+				     IN osm_mad_pool_t * const p_mad_pool,
+				     IN osm_vendor_t * const p_vendor,
+				     IN osm_subn_t * const p_subn,
+				     IN osm_log_t * const p_log,
+				     IN osm_stats_t * const p_stats,
+				     IN cl_dispatcher_t * const p_disp);
 /*
 * PARAMETERS
 *	p_ctrl
@@ -267,9 +261,8 @@ ib_api_status_t osm_sa_mad_ctrl_init(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_sa_mad_ctrl_bind(
-	IN osm_sa_mad_ctrl_t* const p_ctrl,
-	IN const ib_net64_t port_guid );
+osm_sa_mad_ctrl_bind(IN osm_sa_mad_ctrl_t * const p_ctrl,
+		     IN const ib_net64_t port_guid);
 /*
 * PARAMETERS
 *	p_ctrl
@@ -298,9 +291,7 @@ osm_sa_mad_ctrl_bind(
 *
 * SYNOPSIS
 */
-ib_api_status_t
-osm_sa_mad_ctrl_unbind(
-  IN osm_sa_mad_ctrl_t* const p_ctrl);
+ib_api_status_t osm_sa_mad_ctrl_unbind(IN osm_sa_mad_ctrl_t * const p_ctrl);
 /*
 * PARAMETERS
 *	p_ctrl
@@ -326,11 +317,11 @@ osm_sa_mad_ctrl_unbind(
 * SYNOPSIS
 */
 static inline osm_bind_handle_t
-osm_sa_mad_ctrl_get_bind_handle(
-	IN const osm_sa_mad_ctrl_t* const p_ctrl )
+osm_sa_mad_ctrl_get_bind_handle(IN const osm_sa_mad_ctrl_t * const p_ctrl)
 {
-	return( p_ctrl->h_bind );
+	return (p_ctrl->h_bind);
 }
+
 /*
 * PARAMETERS
 *	p_ctrl
@@ -348,5 +339,4 @@ osm_sa_mad_ctrl_get_bind_handle(
 *********/
 
 END_C_DECLS
-
-#endif	/* _OSM_SA_MAD_CTRL_H_ */
+#endif				/* _OSM_SA_MAD_CTRL_H_ */
diff --git a/opensm/include/opensm/osm_sa_mcmember_record.h b/opensm/include/opensm/osm_sa_mcmember_record.h
index 3a119c5..a7102ca 100644
--- a/opensm/include/opensm/osm_sa_mcmember_record.h
+++ b/opensm/include/opensm/osm_sa_mcmember_record.h
@@ -62,13 +62,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/MCMember Receiver
 * NAME
 *	MCMember Receiver
@@ -86,7 +85,6 @@ BEGIN_C_DECLS
 *	Anil Keshavamurthy, Intel
 *
 *********/
-
 /****s* OpenSM: MCMember Receiver/osm_mcmr_recv_t
 * NAME
 *	osm_mcmr_recv_t
@@ -99,21 +97,17 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-
-
-typedef struct _osm_mcmr
-{
-	osm_subn_t	*p_subn;
-	osm_sm_t	*p_sm;
-	osm_sa_resp_t	*p_resp;
-	osm_mad_pool_t	*p_mad_pool;
-	osm_log_t	*p_log;
-	cl_plock_t	*p_lock;
-	uint16_t	mlid_ho;
-	cl_qlock_pool_t	pool;
+typedef struct _osm_mcmr {
+	osm_subn_t *p_subn;
+	osm_sm_t *p_sm;
+	osm_sa_resp_t *p_resp;
+	osm_mad_pool_t *p_mad_pool;
+	osm_log_t *p_log;
+	cl_plock_t *p_lock;
+	uint16_t mlid_ho;
+	cl_qlock_pool_t pool;
 } osm_mcmr_recv_t;
 
-
 /*
 * FIELDS
 *	p_subn
@@ -141,8 +135,7 @@ typedef struct _osm_mcmr
 *
 * SYNOPSIS
 */
-void osm_mcmr_rcv_construct(
-	IN osm_mcmr_recv_t* const p_ctrl );
+void osm_mcmr_rcv_construct(IN osm_mcmr_recv_t * const p_ctrl);
 /*
 * PARAMETERS
 *	p_ctrl
@@ -172,8 +165,7 @@ void osm_mcmr_rcv_construct(
 *
 * SYNOPSIS
 */
-void osm_mcmr_rcv_destroy(
-	IN osm_mcmr_recv_t* const p_ctrl );
+void osm_mcmr_rcv_destroy(IN osm_mcmr_recv_t * const p_ctrl);
 /*
 * PARAMETERS
 *	p_ctrl
@@ -204,14 +196,13 @@ void osm_mcmr_rcv_destroy(
 *
 * SYNOPSIS
 */
-ib_api_status_t osm_mcmr_rcv_init(
-	IN osm_sm_t * const p_sm,
-	IN osm_mcmr_recv_t* const p_ctrl,
-	IN osm_sa_resp_t* const p_resp,
-	IN osm_mad_pool_t* const p_mad_pool,
-	IN osm_subn_t* const p_subn,
-	IN osm_log_t* const p_log,
-	IN cl_plock_t* const p_lock );
+ib_api_status_t osm_mcmr_rcv_init(IN osm_sm_t * const p_sm,
+				  IN osm_mcmr_recv_t * const p_ctrl,
+				  IN osm_sa_resp_t * const p_resp,
+				  IN osm_mad_pool_t * const p_mad_pool,
+				  IN osm_subn_t * const p_subn,
+				  IN osm_log_t * const p_log,
+				  IN cl_plock_t * const p_lock);
 /*
 * PARAMETERS
 *	p_sm
@@ -252,9 +243,7 @@ ib_api_status_t osm_mcmr_rcv_init(
 *
 * SYNOPSIS
 */
-void osm_mcmr_rcv_process(
-	IN void *context,
-	IN void *data );
+void osm_mcmr_rcv_process(IN void *context, IN void *data);
 /*
 * PARAMETERS
 *	context
@@ -274,8 +263,6 @@ void osm_mcmr_rcv_process(
 *	MCMember Receiver, MCMember Response Controller
 *********/
 
-
-
 /****f* OpenSM: MC Member Record Receiver/osm_mcmr_rcv_create_new_mgrp
 * NAME
 *	osm_mcmr_rcv_create_new_mgrp
@@ -287,12 +274,12 @@ void osm_mcmr_rcv_process(
 */
 
 ib_api_status_t
-osm_mcmr_rcv_create_new_mgrp(
-									  IN osm_mcmr_recv_t* const p_mcmr,
-									  IN uint64_t comp_mask,
-									  IN const ib_member_rec_t* const p_recvd_mcmember_rec,
-                             IN const osm_physp_t* const p_req_physp,
-									  OUT osm_mgrp_t **pp_mgrp);
+osm_mcmr_rcv_create_new_mgrp(IN osm_mcmr_recv_t * const p_mcmr,
+			     IN uint64_t comp_mask,
+			     IN const ib_member_rec_t *
+			     const p_recvd_mcmember_rec,
+			     IN const osm_physp_t * const p_req_physp,
+			     OUT osm_mgrp_t ** pp_mgrp);
 /*
 * PARAMETERS
 *	p_mcmr
@@ -328,11 +315,11 @@ osm_mcmr_rcv_create_new_mgrp(
 */
 
 ib_api_status_t
-osm_mcmr_rcv_find_or_create_new_mgrp(
-	  IN osm_mcmr_recv_t* const p_mcmr,
-	  IN uint64_t comp_mask,
-	  IN ib_member_rec_t* const p_recvd_mcmember_rec,
-	  OUT osm_mgrp_t **pp_mgrp);
+osm_mcmr_rcv_find_or_create_new_mgrp(IN osm_mcmr_recv_t * const p_mcmr,
+				     IN uint64_t comp_mask,
+				     IN ib_member_rec_t *
+				     const p_recvd_mcmember_rec,
+				     OUT osm_mgrp_t ** pp_mgrp);
 /*
 * PARAMETERS
 *	p_mcmr
@@ -416,5 +403,4 @@ osm_mcmr_rcv_find_or_create_new_mgrp(
 #define MC_SENDONLY_NON_MEMBER		0x4
 
 END_C_DECLS
-
-#endif	/* _OSM_MCMR_H_ */
+#endif				/* _OSM_MCMR_H_ */
diff --git a/opensm/include/opensm/osm_sa_mft_record.h b/opensm/include/opensm/osm_sa_mft_record.h
index e4c04c6..dd14257 100644
--- a/opensm/include/opensm/osm_sa_mft_record.h
+++ b/opensm/include/opensm/osm_sa_mft_record.h
@@ -60,13 +60,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/Multicast Forwarding Table Receiver
 * NAME
 *	Multicast Forwarding Table Receiver
@@ -84,7 +83,6 @@ BEGIN_C_DECLS
 *	Hal Rosenstock, Voltaire
 *
 *********/
-
 /****s* OpenSM: Multicast Forwarding Table Receiver/osm_mftr_rcv_t
 * NAME
 *	osm_mftr_rcv_t
@@ -97,15 +95,14 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_mft
-{
-	osm_subn_t*	p_subn;
-	osm_stats_t*	p_stats;
-	osm_sa_resp_t*	p_resp;
-	osm_mad_pool_t*	p_mad_pool;
-	osm_log_t*	p_log;
-	cl_plock_t*	p_lock;
-	cl_qlock_pool_t	pool;
+typedef struct _osm_mft {
+	osm_subn_t *p_subn;
+	osm_stats_t *p_stats;
+	osm_sa_resp_t *p_resp;
+	osm_mad_pool_t *p_mad_pool;
+	osm_log_t *p_log;
+	cl_plock_t *p_lock;
+	cl_qlock_pool_t pool;
 } osm_mftr_rcv_t;
 /*
 * FIELDS
@@ -144,8 +141,7 @@ typedef struct _osm_mft
 *
 * SYNOPSIS
 */
-void osm_mftr_rcv_construct(
-	IN osm_mftr_rcv_t* const p_ctrl );
+void osm_mftr_rcv_construct(IN osm_mftr_rcv_t * const p_ctrl);
 /*
 * PARAMETERS
 *	p_ctrl
@@ -175,8 +171,7 @@ void osm_mftr_rcv_construct(
 *
 * SYNOPSIS
 */
-void osm_mftr_rcv_destroy(
-	IN osm_mftr_rcv_t* const p_ctrl );
+void osm_mftr_rcv_destroy(IN osm_mftr_rcv_t * const p_ctrl);
 /*
 * PARAMETERS
 *	p_ctrl
@@ -207,13 +202,12 @@ void osm_mftr_rcv_destroy(
 *
 * SYNOPSIS
 */
-ib_api_status_t osm_mftr_rcv_init(
-	IN osm_mftr_rcv_t* const p_rcv,
-	IN osm_sa_resp_t* const p_resp,
-	IN osm_mad_pool_t* const p_mad_pool,
-	IN osm_subn_t* const p_subn,
-	IN osm_log_t* const p_log,
-	IN cl_plock_t* const p_lock );
+ib_api_status_t osm_mftr_rcv_init(IN osm_mftr_rcv_t * const p_rcv,
+				  IN osm_sa_resp_t * const p_resp,
+				  IN osm_mad_pool_t * const p_mad_pool,
+				  IN osm_subn_t * const p_subn,
+				  IN osm_log_t * const p_log,
+				  IN cl_plock_t * const p_lock);
 /*
 * PARAMETERS
 *	p_rcv
@@ -252,9 +246,7 @@ ib_api_status_t osm_mftr_rcv_init(
 *
 * SYNOPSIS
 */
-void osm_mftr_rcv_process(
-	IN void *context,
-	IN void *data );
+void osm_mftr_rcv_process(IN void *context, IN void *data);
 /*
 * PARAMETERS
 *	context
@@ -276,5 +268,4 @@ void osm_mftr_rcv_process(
 *********/
 
 END_C_DECLS
-
-#endif	/* _OSM_MFTR_H_ */
+#endif				/* _OSM_MFTR_H_ */
diff --git a/opensm/include/opensm/osm_sa_multipath_record.h b/opensm/include/opensm/osm_sa_multipath_record.h
index 6f99ec9..8fa1046 100644
--- a/opensm/include/opensm/osm_sa_multipath_record.h
+++ b/opensm/include/opensm/osm_sa_multipath_record.h
@@ -62,13 +62,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/MultiPath Record Receiver
 * NAME
 *	MultiPath Record Receiver
@@ -86,7 +85,6 @@ BEGIN_C_DECLS
 *	Hal Rosenstock, Voltaire
 *
 *********/
-
 /****s* OpenSM: MultiPath Record Receiver/osm_mpr_rcv_t
 * NAME
 *	osm_mpr_rcv_t
@@ -99,14 +97,13 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_mpr_rcv
-{
-	osm_subn_t	*p_subn;
-	osm_sa_resp_t	*p_resp;
-	osm_mad_pool_t	*p_mad_pool;
-	osm_log_t	*p_log;
-	cl_plock_t	*p_lock;
-	cl_qlock_pool_t	pr_pool;
+typedef struct _osm_mpr_rcv {
+	osm_subn_t *p_subn;
+	osm_sa_resp_t *p_resp;
+	osm_mad_pool_t *p_mad_pool;
+	osm_log_t *p_log;
+	cl_plock_t *p_lock;
+	cl_qlock_pool_t pr_pool;
 } osm_mpr_rcv_t;
 /*
 * FIELDS
@@ -138,9 +135,7 @@ typedef struct _osm_mpr_rcv
 *
 * SYNOPSIS
 */
-void
-osm_mpr_rcv_construct(
-	IN osm_mpr_rcv_t* const p_rcv );
+void osm_mpr_rcv_construct(IN osm_mpr_rcv_t * const p_rcv);
 /*
 * PARAMETERS
 *	p_rcv
@@ -169,9 +164,7 @@ osm_mpr_rcv_construct(
 *
 * SYNOPSIS
 */
-void
-osm_mpr_rcv_destroy(
-	IN osm_mpr_rcv_t* const p_rcv );
+void osm_mpr_rcv_destroy(IN osm_mpr_rcv_t * const p_rcv);
 /*
 * PARAMETERS
 *	p_rcv
@@ -203,13 +196,11 @@ osm_mpr_rcv_destroy(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_mpr_rcv_init(
-	IN osm_mpr_rcv_t* const p_rcv,
-	IN osm_sa_resp_t* const p_resp,
-	IN osm_mad_pool_t* const p_mad_pool,
-	IN osm_subn_t* const p_subn,
-	IN osm_log_t* const p_log,
-	IN cl_plock_t* const p_lock );
+osm_mpr_rcv_init(IN osm_mpr_rcv_t * const p_rcv,
+		 IN osm_sa_resp_t * const p_resp,
+		 IN osm_mad_pool_t * const p_mad_pool,
+		 IN osm_subn_t * const p_subn,
+		 IN osm_log_t * const p_log, IN cl_plock_t * const p_lock);
 /*
 * PARAMETERS
 *	p_rcv
@@ -245,10 +236,7 @@ osm_mpr_rcv_init(
 *
 * SYNOPSIS
 */
-void
-osm_mpr_rcv_process(
-	IN void *context,
-	IN void *data );
+void osm_mpr_rcv_process(IN void *context, IN void *data);
 /*
 * PARAMETERS
 *	context
@@ -269,5 +257,4 @@ osm_mpr_rcv_process(
 *********/
 
 END_C_DECLS
-
-#endif	/* _OSM_MPR_RCV_H_ */
+#endif				/* _OSM_MPR_RCV_H_ */
diff --git a/opensm/include/opensm/osm_sa_node_record.h b/opensm/include/opensm/osm_sa_node_record.h
index 4ad5d3b..df95734 100644
--- a/opensm/include/opensm/osm_sa_node_record.h
+++ b/opensm/include/opensm/osm_sa_node_record.h
@@ -60,13 +60,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/Node Record Receiver
 * NAME
 *	Node Record Receiver
@@ -84,7 +83,6 @@ BEGIN_C_DECLS
 *	Anil S Keshavamurthy, Intel
 *
 *********/
-
 /****s* OpenSM: Node Record Receiver/osm_nr_rcv_t
 * NAME
 *	osm_nr_rcv_t
@@ -97,14 +95,13 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_nr_recv
-{
-	const osm_subn_t	*p_subn;
-	osm_sa_resp_t		*p_resp;
-	osm_mad_pool_t		*p_mad_pool;
-	osm_log_t		*p_log;
-	cl_plock_t		*p_lock;
-	cl_qlock_pool_t		pool;
+typedef struct _osm_nr_recv {
+	const osm_subn_t *p_subn;
+	osm_sa_resp_t *p_resp;
+	osm_mad_pool_t *p_mad_pool;
+	osm_log_t *p_log;
+	cl_plock_t *p_lock;
+	cl_qlock_pool_t pool;
 } osm_nr_rcv_t;
 /*
 * FIELDS
@@ -140,8 +137,7 @@ typedef struct _osm_nr_recv
 *
 * SYNOPSIS
 */
-void osm_nr_rcv_construct(
-	IN osm_nr_rcv_t* const p_rcv );
+void osm_nr_rcv_construct(IN osm_nr_rcv_t * const p_rcv);
 /*
 * PARAMETERS
 *	p_rcv
@@ -170,8 +166,7 @@ void osm_nr_rcv_construct(
 *
 * SYNOPSIS
 */
-void osm_nr_rcv_destroy(
-	IN osm_nr_rcv_t* const p_rcv );
+void osm_nr_rcv_destroy(IN osm_nr_rcv_t * const p_rcv);
 /*
 * PARAMETERS
 *	p_rcv
@@ -202,13 +197,12 @@ void osm_nr_rcv_destroy(
 *
 * SYNOPSIS
 */
-ib_api_status_t osm_nr_rcv_init(
-	IN osm_nr_rcv_t* const p_rcv,
-	IN osm_sa_resp_t* const p_resp,
-	IN osm_mad_pool_t* const p_mad_pool,
-	IN const osm_subn_t* const p_subn,
-	IN osm_log_t* const p_log,
-	IN cl_plock_t* const p_lock );
+ib_api_status_t osm_nr_rcv_init(IN osm_nr_rcv_t * const p_rcv,
+				IN osm_sa_resp_t * const p_resp,
+				IN osm_mad_pool_t * const p_mad_pool,
+				IN const osm_subn_t * const p_subn,
+				IN osm_log_t * const p_log,
+				IN cl_plock_t * const p_lock);
 /*
 * PARAMETERS
 *	p_rcv
@@ -240,7 +234,6 @@ ib_api_status_t osm_nr_rcv_init(
 *	Node Record Receiver object, osm_nr_rcv_construct, osm_nr_rcv_destroy
 *********/
 
-
 /****f* OpenSM: Node Record Receiver/osm_nr_rcv_process
 * NAME
 *	osm_nr_rcv_process
@@ -250,9 +243,7 @@ ib_api_status_t osm_nr_rcv_init(
 *
 * SYNOPSIS
 */
-void osm_nr_rcv_process(
-	IN void *context,
-	IN void *data );
+void osm_nr_rcv_process(IN void *context, IN void *data);
 /*
 * PARAMETERS
 *	context
@@ -270,5 +261,4 @@ void osm_nr_rcv_process(
 *********/
 
 END_C_DECLS
-
-#endif	/* _OSM_NR_H_ */
+#endif				/* _OSM_NR_H_ */
diff --git a/opensm/include/opensm/osm_sa_path_record.h b/opensm/include/opensm/osm_sa_path_record.h
index 29667ef..88eb6c3 100644
--- a/opensm/include/opensm/osm_sa_path_record.h
+++ b/opensm/include/opensm/osm_sa_path_record.h
@@ -62,13 +62,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/Path Record Receiver
 * NAME
 *	Path Record Receiver
@@ -87,7 +86,6 @@ BEGIN_C_DECLS
 *	Steve King, Intel
 *
 *********/
-
 /****s* OpenSM: Path Record Receiver/osm_pr_rcv_t
 * NAME
 *	osm_pr_rcv_t
@@ -100,14 +98,13 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_pr_rcv
-{
-	osm_subn_t	*p_subn;
-	osm_sa_resp_t	*p_resp;
-	osm_mad_pool_t	*p_mad_pool;
-	osm_log_t	*p_log;
-	cl_plock_t	*p_lock;
-	cl_qlock_pool_t	pr_pool;
+typedef struct _osm_pr_rcv {
+	osm_subn_t *p_subn;
+	osm_sa_resp_t *p_resp;
+	osm_mad_pool_t *p_mad_pool;
+	osm_log_t *p_log;
+	cl_plock_t *p_lock;
+	cl_qlock_pool_t pr_pool;
 } osm_pr_rcv_t;
 /*
 * FIELDS
@@ -139,9 +136,7 @@ typedef struct _osm_pr_rcv
 *
 * SYNOPSIS
 */
-void
-osm_pr_rcv_construct(
-	IN osm_pr_rcv_t* const p_rcv );
+void osm_pr_rcv_construct(IN osm_pr_rcv_t * const p_rcv);
 /*
 * PARAMETERS
 *	p_rcv
@@ -170,9 +165,7 @@ osm_pr_rcv_construct(
 *
 * SYNOPSIS
 */
-void
-osm_pr_rcv_destroy(
-	IN osm_pr_rcv_t* const p_rcv );
+void osm_pr_rcv_destroy(IN osm_pr_rcv_t * const p_rcv);
 /*
 * PARAMETERS
 *	p_rcv
@@ -204,13 +197,11 @@ osm_pr_rcv_destroy(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_pr_rcv_init(
-	IN osm_pr_rcv_t* const p_rcv,
-	IN osm_sa_resp_t* const p_resp,
-	IN osm_mad_pool_t* const p_mad_pool,
-	IN osm_subn_t* const p_subn,
-	IN osm_log_t* const p_log,
-	IN cl_plock_t* const p_lock );
+osm_pr_rcv_init(IN osm_pr_rcv_t * const p_rcv,
+		IN osm_sa_resp_t * const p_resp,
+		IN osm_mad_pool_t * const p_mad_pool,
+		IN osm_subn_t * const p_subn,
+		IN osm_log_t * const p_log, IN cl_plock_t * const p_lock);
 /*
 * PARAMETERS
 *	p_rcv
@@ -246,10 +237,7 @@ osm_pr_rcv_init(
 *
 * SYNOPSIS
 */
-void
-osm_pr_rcv_process(
-	IN void *context,
-	IN void *data );
+void osm_pr_rcv_process(IN void *context, IN void *data);
 /*
 * PARAMETERS
 *	context
@@ -270,5 +258,4 @@ osm_pr_rcv_process(
 *********/
 
 END_C_DECLS
-
-#endif	/* _OSM_PR_H_ */
+#endif				/* _OSM_PR_H_ */
diff --git a/opensm/include/opensm/osm_sa_pkey_record.h b/opensm/include/opensm/osm_sa_pkey_record.h
index aceab9a..660804c 100644
--- a/opensm/include/opensm/osm_sa_pkey_record.h
+++ b/opensm/include/opensm/osm_sa_pkey_record.h
@@ -48,13 +48,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/P_Key Record Receiver
 * NAME
 *  P_Key Record Receiver
@@ -72,7 +71,6 @@ BEGIN_C_DECLS
 *  Yael Kalka, Mellanox
 *
 *********/
-
 /****s* OpenSM: P_Key Record Receiver/osm_pkey_rec_rcv_t
 * NAME
 *  osm_pkey_rec_rcv_t
@@ -85,14 +83,13 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_pkey_rec_rcv
-{
-  const osm_subn_t* p_subn;
-  osm_sa_resp_t* p_resp;
-  osm_mad_pool_t* p_mad_pool;
-  osm_log_t* p_log;
-  cl_plock_t* p_lock;
-  cl_qlock_pool_t pool;
+typedef struct _osm_pkey_rec_rcv {
+	const osm_subn_t *p_subn;
+	osm_sa_resp_t *p_resp;
+	osm_mad_pool_t *p_mad_pool;
+	osm_log_t *p_log;
+	cl_plock_t *p_lock;
+	cl_qlock_pool_t pool;
 } osm_pkey_rec_rcv_t;
 /*
 * FIELDS
@@ -128,9 +125,7 @@ typedef struct _osm_pkey_rec_rcv
 *
 * SYNOPSIS
 */
-void
-osm_pkey_rec_rcv_construct(
-  IN osm_pkey_rec_rcv_t* const p_rcv );
+void osm_pkey_rec_rcv_construct(IN osm_pkey_rec_rcv_t * const p_rcv);
 /*
 * PARAMETERS
 *  p_rcv
@@ -160,9 +155,7 @@ osm_pkey_rec_rcv_construct(
 *
 * SYNOPSIS
 */
-void
-osm_pkey_rec_rcv_destroy(
-  IN osm_pkey_rec_rcv_t* const p_rcv );
+void osm_pkey_rec_rcv_destroy(IN osm_pkey_rec_rcv_t * const p_rcv);
 /*
 * PARAMETERS
 *  p_rcv
@@ -194,13 +187,11 @@ osm_pkey_rec_rcv_destroy(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_pkey_rec_rcv_init(
-  IN osm_pkey_rec_rcv_t* const p_rcv,
-  IN osm_sa_resp_t* const p_resp,
-  IN osm_mad_pool_t* const p_mad_pool,
-  IN const osm_subn_t* const p_subn,
-  IN osm_log_t* const p_log,
-  IN cl_plock_t* const p_lock );
+osm_pkey_rec_rcv_init(IN osm_pkey_rec_rcv_t * const p_rcv,
+		      IN osm_sa_resp_t * const p_resp,
+		      IN osm_mad_pool_t * const p_mad_pool,
+		      IN const osm_subn_t * const p_subn,
+		      IN osm_log_t * const p_log, IN cl_plock_t * const p_lock);
 /*
 * PARAMETERS
 *  p_rcv
@@ -239,10 +230,7 @@ osm_pkey_rec_rcv_init(
 *
 * SYNOPSIS
 */
-void
-osm_pkey_rec_rcv_process(
-  IN void *context,
-  IN void *data );
+void osm_pkey_rec_rcv_process(IN void *context, IN void *data);
 /*
 * PARAMETERS
 *  context
@@ -263,5 +251,4 @@ osm_pkey_rec_rcv_process(
 *********/
 
 END_C_DECLS
-
-#endif   /* _OSM_PKEY_REC_RCV_H_ */
+#endif				/* _OSM_PKEY_REC_RCV_H_ */
diff --git a/opensm/include/opensm/osm_sa_portinfo_record.h b/opensm/include/opensm/osm_sa_portinfo_record.h
index d3bbebe..38eabdb 100644
--- a/opensm/include/opensm/osm_sa_portinfo_record.h
+++ b/opensm/include/opensm/osm_sa_portinfo_record.h
@@ -61,13 +61,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/PortInfo Record Receiver
 * NAME
 *	PortInfo Record Receiver
@@ -85,7 +84,6 @@ BEGIN_C_DECLS
 *	Ranjit Pandit, Intel
 *
 *********/
-
 /****s* OpenSM: PortInfo Record Receiver/osm_pir_rcv_t
 * NAME
 *	osm_pir_rcv_t
@@ -98,14 +96,13 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_pir_rcv
-{
-	osm_subn_t	*p_subn;
-	osm_sa_resp_t	*p_resp;
-	osm_mad_pool_t	*p_mad_pool;
-	osm_log_t	*p_log;
-	cl_plock_t	*p_lock;
-	cl_qlock_pool_t	 pool;
+typedef struct _osm_pir_rcv {
+	osm_subn_t *p_subn;
+	osm_sa_resp_t *p_resp;
+	osm_mad_pool_t *p_mad_pool;
+	osm_log_t *p_log;
+	cl_plock_t *p_lock;
+	cl_qlock_pool_t pool;
 } osm_pir_rcv_t;
 /*
 * FIELDS
@@ -141,9 +138,7 @@ typedef struct _osm_pir_rcv
 *
 * SYNOPSIS
 */
-void
-osm_pir_rcv_construct(
-	IN osm_pir_rcv_t* const p_rcv );
+void osm_pir_rcv_construct(IN osm_pir_rcv_t * const p_rcv);
 /*
 * PARAMETERS
 *	p_rcv
@@ -173,9 +168,7 @@ osm_pir_rcv_construct(
 *
 * SYNOPSIS
 */
-void
-osm_pir_rcv_destroy(
-	IN osm_pir_rcv_t* const p_rcv );
+void osm_pir_rcv_destroy(IN osm_pir_rcv_t * const p_rcv);
 /*
 * PARAMETERS
 *	p_rcv
@@ -207,13 +200,11 @@ osm_pir_rcv_destroy(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_pir_rcv_init(
-	IN osm_pir_rcv_t* const p_rcv,
-	IN osm_sa_resp_t* const p_resp,
-	IN osm_mad_pool_t* const p_mad_pool,
-	IN osm_subn_t* const p_subn,
-	IN osm_log_t* const p_log,
-	IN cl_plock_t* const p_lock );
+osm_pir_rcv_init(IN osm_pir_rcv_t * const p_rcv,
+		 IN osm_sa_resp_t * const p_resp,
+		 IN osm_mad_pool_t * const p_mad_pool,
+		 IN osm_subn_t * const p_subn,
+		 IN osm_log_t * const p_log, IN cl_plock_t * const p_lock);
 /*
 * PARAMETERS
 *	p_rcv
@@ -252,10 +243,7 @@ osm_pir_rcv_init(
 *
 * SYNOPSIS
 */
-void
-osm_pir_rcv_process(
-	IN void *context,
-	IN void *data );
+void osm_pir_rcv_process(IN void *context, IN void *data);
 /*
 * PARAMETERS
 *	context
@@ -276,5 +264,4 @@ osm_pir_rcv_process(
 *********/
 
 END_C_DECLS
-
-#endif	/* _OSM_PIR_RCV_H_ */
+#endif				/* _OSM_PIR_RCV_H_ */
diff --git a/opensm/include/opensm/osm_sa_response.h b/opensm/include/opensm/osm_sa_response.h
index b9e84d1..8f75dbb 100644
--- a/opensm/include/opensm/osm_sa_response.h
+++ b/opensm/include/opensm/osm_sa_response.h
@@ -56,13 +56,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/SA Response
 * NAME
 *	SA Response
@@ -81,7 +80,6 @@ BEGIN_C_DECLS
 *	Steve King, Intel
 *
 *********/
-
 /****s* OpenSM: SA Response/osm_sa_resp_t
 * NAME
 *	osm_sa_resp_t
@@ -94,10 +92,9 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_sa_resp
-{
-	osm_mad_pool_t				*p_pool;
-	osm_log_t				*p_log;
+typedef struct _osm_sa_resp {
+	osm_mad_pool_t *p_pool;
+	osm_log_t *p_log;
 } osm_sa_resp_t;
 /*
 * FIELDS
@@ -117,9 +114,7 @@ typedef struct _osm_sa_resp
 *
 * SYNOPSIS
 */
-void
-osm_sa_resp_construct(
-	IN osm_sa_resp_t* const p_resp );
+void osm_sa_resp_construct(IN osm_sa_resp_t * const p_resp);
 /*
 * PARAMETERS
 *	p_resp
@@ -149,9 +144,7 @@ osm_sa_resp_construct(
 *
 * SYNOPSIS
 */
-void
-osm_sa_resp_destroy(
-	IN osm_sa_resp_t* const p_resp );
+void osm_sa_resp_destroy(IN osm_sa_resp_t * const p_resp);
 /*
 * PARAMETERS
 *	p_resp
@@ -183,10 +176,8 @@ osm_sa_resp_destroy(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_sa_resp_init(
-	IN osm_sa_resp_t*		const p_resp,
-	IN osm_mad_pool_t*		const p_pool,
-	IN osm_log_t*			const p_log );
+osm_sa_resp_init(IN osm_sa_resp_t * const p_resp,
+		 IN osm_mad_pool_t * const p_pool, IN osm_log_t * const p_log);
 /*
 * PARAMETERS
 *	p_resp
@@ -224,10 +215,9 @@ osm_sa_resp_init(
 * SYNOPSIS
 */
 void
-osm_sa_send_error(
-    IN osm_sa_resp_t*		const p_resp,
-    IN const osm_madw_t*	const p_madw,
-    IN const ib_net16_t		sa_status );
+osm_sa_send_error(IN osm_sa_resp_t * const p_resp,
+		  IN const osm_madw_t * const p_madw,
+		  IN const ib_net16_t sa_status);
 /*
 * PARAMETERS
 *	p_resp
@@ -251,5 +241,4 @@ osm_sa_send_error(
 *********/
 
 END_C_DECLS
-
-#endif	/* _OSM_SA_RESP_H_ */
+#endif				/* _OSM_SA_RESP_H_ */
diff --git a/opensm/include/opensm/osm_sa_service_record.h b/opensm/include/opensm/osm_sa_service_record.h
index d485509..8884944 100644
--- a/opensm/include/opensm/osm_sa_service_record.h
+++ b/opensm/include/opensm/osm_sa_service_record.h
@@ -63,13 +63,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/Service Record Receiver
 * NAME
 *	Service Record Receiver
@@ -87,7 +86,6 @@ BEGIN_C_DECLS
 *	Anil S Keshavamurthy
 *
 *********/
-
 /****s* OpenSM: Service Record Receiver/osm_sr_rcv_t
 * NAME
 *	osm_sr_rcv_t
@@ -100,15 +98,14 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_sr_rcv
-{
-	osm_subn_t	*p_subn;
-	osm_sa_resp_t	*p_resp;
-	osm_mad_pool_t	*p_mad_pool;
-	osm_log_t	*p_log;
-	cl_plock_t	*p_lock;
-	cl_qlock_pool_t	sr_pool;
-	cl_timer_t	sr_timer;
+typedef struct _osm_sr_rcv {
+	osm_subn_t *p_subn;
+	osm_sa_resp_t *p_resp;
+	osm_mad_pool_t *p_mad_pool;
+	osm_log_t *p_log;
+	cl_plock_t *p_lock;
+	cl_qlock_pool_t sr_pool;
+	cl_timer_t sr_timer;
 } osm_sr_rcv_t;
 /*
 * FIELDS
@@ -140,9 +137,7 @@ typedef struct _osm_sr_rcv
 *
 * SYNOPSIS
 */
-void
-osm_sr_rcv_construct(
-	IN osm_sr_rcv_t* const p_rcv );
+void osm_sr_rcv_construct(IN osm_sr_rcv_t * const p_rcv);
 /*
 * PARAMETERS
 *	p_rcv
@@ -171,9 +166,7 @@ osm_sr_rcv_construct(
 *
 * SYNOPSIS
 */
-void
-osm_sr_rcv_destroy(
-	IN osm_sr_rcv_t* const p_rcv );
+void osm_sr_rcv_destroy(IN osm_sr_rcv_t * const p_rcv);
 /*
 * PARAMETERS
 *	p_rcv
@@ -205,13 +198,11 @@ osm_sr_rcv_destroy(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_sr_rcv_init(
-	IN osm_sr_rcv_t* const p_rcv,
-	IN osm_sa_resp_t* const p_resp,
-	IN osm_mad_pool_t* const p_mad_pool,
-	IN osm_subn_t* const p_subn,
-	IN osm_log_t* const p_log,
-	IN cl_plock_t* const p_lock );
+osm_sr_rcv_init(IN osm_sr_rcv_t * const p_rcv,
+		IN osm_sa_resp_t * const p_resp,
+		IN osm_mad_pool_t * const p_mad_pool,
+		IN osm_subn_t * const p_subn,
+		IN osm_log_t * const p_log, IN cl_plock_t * const p_lock);
 /*
 * PARAMETERS
 *	p_rcv
@@ -247,10 +238,7 @@ osm_sr_rcv_init(
 *
 * SYNOPSIS
 */
-void
-osm_sr_rcv_process(
-	IN void *context,
-	IN void *data );
+void osm_sr_rcv_process(IN void *context, IN void *data);
 /*
 * PARAMETERS
 *	context
@@ -277,9 +265,7 @@ osm_sr_rcv_process(
 * SYNOPSIS
 */
 
-void
-osm_sr_rcv_lease_cb(
-	IN void*    context );
+void osm_sr_rcv_lease_cb(IN void *context);
 /*
 * PARAMETERS
 *	context
@@ -293,5 +279,4 @@ osm_sr_rcv_lease_cb(
 *********/
 
 END_C_DECLS
-
-#endif	/* _OSM_SR_H_ */
+#endif				/* _OSM_SR_H_ */
diff --git a/opensm/include/opensm/osm_sa_slvl_record.h b/opensm/include/opensm/osm_sa_slvl_record.h
index bf8c867..ec7cad0 100644
--- a/opensm/include/opensm/osm_sa_slvl_record.h
+++ b/opensm/include/opensm/osm_sa_slvl_record.h
@@ -61,13 +61,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/SLtoVL Mapping Record Receiver
 * NAME
 *	SLtoVL Mapping Record Receiver
@@ -85,7 +84,6 @@ BEGIN_C_DECLS
 *	Eitan Zahavi, Mellanox
 *
 *********/
-
 /****s* OpenSM: SLtoVL Mapping Record Receiver/osm_slvl_rec_rcv_t
 * NAME
 *	osm_slvl_rec_rcv_t
@@ -98,14 +96,13 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_slvl_rec_rcv
-{
-	const osm_subn_t	*p_subn;
-	osm_sa_resp_t		*p_resp;
-	osm_mad_pool_t		*p_mad_pool;
-	osm_log_t		*p_log;
-	cl_plock_t		*p_lock;
-	cl_qlock_pool_t		 pool;
+typedef struct _osm_slvl_rec_rcv {
+	const osm_subn_t *p_subn;
+	osm_sa_resp_t *p_resp;
+	osm_mad_pool_t *p_mad_pool;
+	osm_log_t *p_log;
+	cl_plock_t *p_lock;
+	cl_qlock_pool_t pool;
 } osm_slvl_rec_rcv_t;
 /*
 * FIELDS
@@ -141,9 +138,7 @@ typedef struct _osm_slvl_rec_rcv
 *
 * SYNOPSIS
 */
-void
-osm_slvl_rec_rcv_construct(
-	IN osm_slvl_rec_rcv_t* const p_rcv );
+void osm_slvl_rec_rcv_construct(IN osm_slvl_rec_rcv_t * const p_rcv);
 /*
 * PARAMETERS
 *	p_rcv
@@ -173,9 +168,7 @@ osm_slvl_rec_rcv_construct(
 *
 * SYNOPSIS
 */
-void
-osm_slvl_rec_rcv_destroy(
-	IN osm_slvl_rec_rcv_t* const p_rcv );
+void osm_slvl_rec_rcv_destroy(IN osm_slvl_rec_rcv_t * const p_rcv);
 /*
 * PARAMETERS
 *	p_rcv
@@ -207,13 +200,11 @@ osm_slvl_rec_rcv_destroy(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_slvl_rec_rcv_init(
-	IN osm_slvl_rec_rcv_t* const p_rcv,
-	IN osm_sa_resp_t* const p_resp,
-	IN osm_mad_pool_t* const p_mad_pool,
-	IN const osm_subn_t* const p_subn,
-	IN osm_log_t* const p_log,
-	IN cl_plock_t* const p_lock );
+osm_slvl_rec_rcv_init(IN osm_slvl_rec_rcv_t * const p_rcv,
+		      IN osm_sa_resp_t * const p_resp,
+		      IN osm_mad_pool_t * const p_mad_pool,
+		      IN const osm_subn_t * const p_subn,
+		      IN osm_log_t * const p_log, IN cl_plock_t * const p_lock);
 /*
 * PARAMETERS
 *	p_rcv
@@ -252,10 +243,7 @@ osm_slvl_rec_rcv_init(
 *
 * SYNOPSIS
 */
-void
-osm_slvl_rec_rcv_process(
-	IN void *context,
-	IN void *data );
+void osm_slvl_rec_rcv_process(IN void *context, IN void *data);
 /*
 * PARAMETERS
 *	context
@@ -276,5 +264,4 @@ osm_slvl_rec_rcv_process(
 *********/
 
 END_C_DECLS
-
-#endif	/* _OSM_SLVL_REC_RCV_H_ */
+#endif				/* _OSM_SLVL_REC_RCV_H_ */
diff --git a/opensm/include/opensm/osm_sa_sminfo_record.h b/opensm/include/opensm/osm_sa_sminfo_record.h
index 0020c4f..ce57925 100644
--- a/opensm/include/opensm/osm_sa_sminfo_record.h
+++ b/opensm/include/opensm/osm_sa_sminfo_record.h
@@ -61,13 +61,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/SM Info Receiver
 * NAME
 *	SM Info Receiver
@@ -97,15 +96,14 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_smir
-{
-	osm_subn_t*	p_subn;
-	osm_stats_t*	p_stats;
-	osm_sa_resp_t*	p_resp;
-	osm_mad_pool_t*	p_mad_pool;
-	osm_log_t*	p_log;
-	cl_plock_t*	p_lock;
-	cl_qlock_pool_t	pool;
+typedef struct _osm_smir {
+	osm_subn_t *p_subn;
+	osm_stats_t *p_stats;
+	osm_sa_resp_t *p_resp;
+	osm_mad_pool_t *p_mad_pool;
+	osm_log_t *p_log;
+	cl_plock_t *p_lock;
+	cl_qlock_pool_t pool;
 } osm_smir_rcv_t;
 /*
 * FIELDS
@@ -125,8 +123,7 @@ typedef struct _osm_smir
 *
 * SYNOPSIS
 */
-void osm_smir_rcv_construct(
-	IN osm_smir_rcv_t* const p_ctrl );
+void osm_smir_rcv_construct(IN osm_smir_rcv_t * const p_ctrl);
 /*
 * PARAMETERS
 *	p_ctrl
@@ -155,8 +152,7 @@ void osm_smir_rcv_construct(
 *
 * SYNOPSIS
 */
-void osm_smir_rcv_destroy(
-	IN osm_smir_rcv_t* const p_ctrl );
+void osm_smir_rcv_destroy(IN osm_smir_rcv_t * const p_ctrl);
 /*
 * PARAMETERS
 *	p_ctrl
@@ -187,14 +183,13 @@ void osm_smir_rcv_destroy(
 *
 * SYNOPSIS
 */
-ib_api_status_t osm_smir_rcv_init(
-	IN osm_smir_rcv_t* const p_ctrl,
-	IN osm_sa_resp_t* const p_resp,
-	IN osm_mad_pool_t* const p_mad_pool,
-	IN osm_subn_t* const p_subn,
-	IN osm_stats_t* const p_stats,
-	IN osm_log_t* const p_log,
-	IN cl_plock_t* const p_lock );
+ib_api_status_t osm_smir_rcv_init(IN osm_smir_rcv_t * const p_ctrl,
+				  IN osm_sa_resp_t * const p_resp,
+				  IN osm_mad_pool_t * const p_mad_pool,
+				  IN osm_subn_t * const p_subn,
+				  IN osm_stats_t * const p_stats,
+				  IN osm_log_t * const p_log,
+				  IN cl_plock_t * const p_lock);
 /*
 * PARAMETERS
 *	p_ctrl
@@ -235,9 +230,7 @@ ib_api_status_t osm_smir_rcv_init(
 *
 * SYNOPSIS
 */
-void osm_smir_rcv_process(
-	IN void *context,
-	IN void *data );
+void osm_smir_rcv_process(IN void *context, IN void *data);
 /*
 * PARAMETERS
 *	context
@@ -258,5 +251,4 @@ void osm_smir_rcv_process(
 *********/
 
 END_C_DECLS
-
-#endif	/* _OSM_SMIR_H_ */
+#endif				/* _OSM_SMIR_H_ */
diff --git a/opensm/include/opensm/osm_sa_sw_info_record.h b/opensm/include/opensm/osm_sa_sw_info_record.h
index dfb40ce..0e876d4 100644
--- a/opensm/include/opensm/osm_sa_sw_info_record.h
+++ b/opensm/include/opensm/osm_sa_sw_info_record.h
@@ -60,13 +60,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/Switch Info Receiver
 * NAME
 *	Switch Info Receiver
@@ -84,7 +83,6 @@ BEGIN_C_DECLS
 *	Hal Rosenstock, Voltaire
 *
 *********/
-
 /****s* OpenSM: Switch Info Receiver/osm_sir_rcv_t
 * NAME
 *	osm_sir_rcv_t
@@ -97,16 +95,15 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_sir_rcv
-{
-	osm_subn_t				*p_subn;
-	osm_sa_resp_t				*p_resp;
-	osm_mad_pool_t				*p_mad_pool;
-	osm_log_t				*p_log;
-	osm_req_t				*p_req;
-	osm_state_mgr_t				*p_state_mgr;
-	cl_plock_t				*p_lock;
-	cl_qlock_pool_t				pool;
+typedef struct _osm_sir_rcv {
+	osm_subn_t *p_subn;
+	osm_sa_resp_t *p_resp;
+	osm_mad_pool_t *p_mad_pool;
+	osm_log_t *p_log;
+	osm_req_t *p_req;
+	osm_state_mgr_t *p_state_mgr;
+	cl_plock_t *p_lock;
+	cl_qlock_pool_t pool;
 } osm_sir_rcv_t;
 /*
 * FIELDS
@@ -138,8 +135,7 @@ typedef struct _osm_sir_rcv
 *
 * SYNOPSIS
 */
-void osm_sir_rcv_construct(
-	IN osm_sir_rcv_t* const p_ctrl );
+void osm_sir_rcv_construct(IN osm_sir_rcv_t * const p_ctrl);
 /*
 * PARAMETERS
 *	p_ctrl
@@ -170,8 +166,7 @@ void osm_sir_rcv_construct(
 *
 * SYNOPSIS
 */
-void osm_sir_rcv_destroy(
-	IN osm_sir_rcv_t* const p_ctrl );
+void osm_sir_rcv_destroy(IN osm_sir_rcv_t * const p_ctrl);
 /*
 * PARAMETERS
 *	p_ctrl
@@ -202,13 +197,12 @@ void osm_sir_rcv_destroy(
 *
 * SYNOPSIS
 */
-ib_api_status_t osm_sir_rcv_init(
-	IN osm_sir_rcv_t* const p_rcv,
-	IN osm_sa_resp_t* const p_resp,
-	IN osm_mad_pool_t* const p_mad_pool,
-	IN osm_subn_t* const p_subn,
-	IN osm_log_t* const p_log,
-	IN cl_plock_t* const p_lock );
+ib_api_status_t osm_sir_rcv_init(IN osm_sir_rcv_t * const p_rcv,
+				 IN osm_sa_resp_t * const p_resp,
+				 IN osm_mad_pool_t * const p_mad_pool,
+				 IN osm_subn_t * const p_subn,
+				 IN osm_log_t * const p_log,
+				 IN cl_plock_t * const p_lock);
 /*
 * PARAMETERS
 *	p_rcv
@@ -250,8 +244,7 @@ ib_api_status_t osm_sir_rcv_init(
 *
 * SYNOPSIS
 */
-boolean_t osm_sir_rcv_is_inited(
-	IN const osm_sir_rcv_t* const p_ctrl );
+boolean_t osm_sir_rcv_is_inited(IN const osm_sir_rcv_t * const p_ctrl);
 /*
 * PARAMETERS
 *	p_ctrl
@@ -279,9 +272,7 @@ boolean_t osm_sir_rcv_is_inited(
 *
 * SYNOPSIS
 */
-void osm_sir_rcv_process(
-	IN void *context,
-	IN void *data );
+void osm_sir_rcv_process(IN void *context, IN void *data);
 /*
 * PARAMETERS
 *	context
@@ -302,5 +293,4 @@ void osm_sir_rcv_process(
 *********/
 
 END_C_DECLS
-
-#endif	/* _OSM_SIR_RCV_H_ */
+#endif				/* _OSM_SIR_RCV_H_ */
diff --git a/opensm/include/opensm/osm_sa_vlarb_record.h b/opensm/include/opensm/osm_sa_vlarb_record.h
index ccb7459..4e1cb19 100644
--- a/opensm/include/opensm/osm_sa_vlarb_record.h
+++ b/opensm/include/opensm/osm_sa_vlarb_record.h
@@ -61,13 +61,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/VLArbitration Record Receiver
 * NAME
 *	VLArbitration Record Receiver
@@ -85,7 +84,6 @@ BEGIN_C_DECLS
 *	Eitan Zahavi, Mellanox
 *
 *********/
-
 /****s* OpenSM: VLArbitration Record Receiver/osm_vlarb_rec_rcv_t
 * NAME
 *	osm_vlarb_rec_rcv_t
@@ -98,14 +96,13 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_vlarb_rec_rcv
-{
-	const osm_subn_t	*p_subn;
-	osm_sa_resp_t		*p_resp;
-	osm_mad_pool_t		*p_mad_pool;
-	osm_log_t		*p_log;
-	cl_plock_t		*p_lock;
-	cl_qlock_pool_t		pool;
+typedef struct _osm_vlarb_rec_rcv {
+	const osm_subn_t *p_subn;
+	osm_sa_resp_t *p_resp;
+	osm_mad_pool_t *p_mad_pool;
+	osm_log_t *p_log;
+	cl_plock_t *p_lock;
+	cl_qlock_pool_t pool;
 } osm_vlarb_rec_rcv_t;
 /*
 * FIELDS
@@ -141,9 +138,7 @@ typedef struct _osm_vlarb_rec_rcv
 *
 * SYNOPSIS
 */
-void
-osm_vlarb_rec_rcv_construct(
-	IN osm_vlarb_rec_rcv_t* const p_rcv );
+void osm_vlarb_rec_rcv_construct(IN osm_vlarb_rec_rcv_t * const p_rcv);
 /*
 * PARAMETERS
 *	p_rcv
@@ -173,9 +168,7 @@ osm_vlarb_rec_rcv_construct(
 *
 * SYNOPSIS
 */
-void
-osm_vlarb_rec_rcv_destroy(
-	IN osm_vlarb_rec_rcv_t* const p_rcv );
+void osm_vlarb_rec_rcv_destroy(IN osm_vlarb_rec_rcv_t * const p_rcv);
 /*
 * PARAMETERS
 *	p_rcv
@@ -207,13 +200,12 @@ osm_vlarb_rec_rcv_destroy(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_vlarb_rec_rcv_init(
-	IN osm_vlarb_rec_rcv_t* const p_rcv,
-	IN osm_sa_resp_t* const p_resp,
-	IN osm_mad_pool_t* const p_mad_pool,
-	IN const osm_subn_t* const p_subn,
-	IN osm_log_t* const p_log,
-	IN cl_plock_t* const p_lock );
+osm_vlarb_rec_rcv_init(IN osm_vlarb_rec_rcv_t * const p_rcv,
+		       IN osm_sa_resp_t * const p_resp,
+		       IN osm_mad_pool_t * const p_mad_pool,
+		       IN const osm_subn_t * const p_subn,
+		       IN osm_log_t * const p_log,
+		       IN cl_plock_t * const p_lock);
 /*
 * PARAMETERS
 *	p_rcv
@@ -252,10 +244,7 @@ osm_vlarb_rec_rcv_init(
 *
 * SYNOPSIS
 */
-void
-osm_vlarb_rec_rcv_process(
-	IN void *context,
-	IN void *data );
+void osm_vlarb_rec_rcv_process(IN void *context, IN void *data);
 /*
 * PARAMETERS
 *	context
@@ -276,5 +265,4 @@ osm_vlarb_rec_rcv_process(
 *********/
 
 END_C_DECLS
-
-#endif	/* _OSM_VLARB_REC_RCV_H_ */
+#endif				/* _OSM_VLARB_REC_RCV_H_ */
diff --git a/opensm/include/opensm/osm_service.h b/opensm/include/opensm/osm_service.h
index 4c121e9..82b6e52 100644
--- a/opensm/include/opensm/osm_service.h
+++ b/opensm/include/opensm/osm_service.h
@@ -57,13 +57,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/Service Record
 * NAME
 *	Service Record
@@ -82,7 +81,6 @@ BEGIN_C_DECLS
 *	Anil S Keshavamurthy, Intel
 *
 *********/
-
 /****s* OpenSM: Service Record/osm_svcr_t
 * NAME
 *	osm_svcr_t
@@ -95,13 +93,11 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-
-typedef struct _osm_svcr_t
-{
-	cl_list_item_t		list_item;
-	ib_service_record_t	service_record;
-	uint32_t		modified_time;
-	uint32_t		lease_period;
+typedef struct _osm_svcr_t {
+	cl_list_item_t list_item;
+	ib_service_record_t service_record;
+	uint32_t modified_time;
+	uint32_t lease_period;
 } osm_svcr_t;
 /*
 * FIELDS
@@ -130,9 +126,7 @@ typedef struct _osm_svcr_t
 *
 * SYNOPSIS
 */
-osm_svcr_t*
-osm_svcr_new(
-	IN const ib_service_record_t *p_svc_rec );
+osm_svcr_t *osm_svcr_new(IN const ib_service_record_t * p_svc_rec);
 /*
 * PARAMETERS
 *	p_svc_rec
@@ -158,9 +152,8 @@ osm_svcr_new(
 * SYNOPSIS
 */
 void
-osm_svcr_init(
-	IN osm_svcr_t* const p_svcr,
-	IN const ib_service_record_t *p_svc_rec  );
+osm_svcr_init(IN osm_svcr_t * const p_svcr,
+	      IN const ib_service_record_t * p_svc_rec);
 /*
 * PARAMETERS
 *	p_svc_rec
@@ -181,9 +174,7 @@ osm_svcr_init(
 *
 * SYNOPSIS
 */
-void
-osm_svcr_delete(
-	IN osm_svcr_t* const p_svcr );
+void osm_svcr_delete(IN osm_svcr_t * const p_svcr);
 /*
 * PARAMETERS
 *	p_svc_rec
@@ -193,23 +184,16 @@ osm_svcr_delete(
 *	Service Record, osm_svcr_new
 *********/
 
-osm_svcr_t*
-osm_svcr_get_by_rid(
-	IN osm_subn_t	const	*p_subn,
-	IN osm_log_t	*p_log,
-	IN ib_service_record_t* const p_svc_rec );
+osm_svcr_t *osm_svcr_get_by_rid(IN osm_subn_t const *p_subn,
+				IN osm_log_t * p_log,
+				IN ib_service_record_t * const p_svc_rec);
 
 void
-osm_svcr_insert_to_db(
-	IN osm_subn_t	*p_subn,
-	IN osm_log_t	*p_log,
-	IN osm_svcr_t	*p_svcr);
+osm_svcr_insert_to_db(IN osm_subn_t * p_subn,
+		      IN osm_log_t * p_log, IN osm_svcr_t * p_svcr);
 void
-osm_svcr_remove_from_db(
-	IN osm_subn_t	*p_subn,
-	IN osm_log_t	*p_log,
-	IN osm_svcr_t	*p_svcr);
+osm_svcr_remove_from_db(IN osm_subn_t * p_subn,
+			IN osm_log_t * p_log, IN osm_svcr_t * p_svcr);
 
 END_C_DECLS
-
-#endif		/* _OSM_SVCR_H_ */
+#endif				/* _OSM_SVCR_H_ */
diff --git a/opensm/include/opensm/osm_slvl_map_rcv.h b/opensm/include/opensm/osm_slvl_map_rcv.h
index 8a7f5b5..2476588 100644
--- a/opensm/include/opensm/osm_slvl_map_rcv.h
+++ b/opensm/include/opensm/osm_slvl_map_rcv.h
@@ -59,13 +59,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/Slvl Map Receiver
 * NAME
 *	Slvl Map Receiver
@@ -83,7 +82,6 @@ BEGIN_C_DECLS
 *	Eitan Zahavi, Mellanox
 *
 *********/
-
 /****s* OpenSM: Slvl Map Receiver/osm_slvl_rcv_t
 * NAME
 *	osm_slvl_rcv_t
@@ -96,12 +94,11 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_slvl_rcv
-{
-	osm_subn_t	*p_subn;
-	osm_req_t	*p_req;
-	osm_log_t	*p_log;
-	cl_plock_t	*p_lock;
+typedef struct _osm_slvl_rcv {
+	osm_subn_t *p_subn;
+	osm_req_t *p_req;
+	osm_log_t *p_log;
+	cl_plock_t *p_lock;
 } osm_slvl_rcv_t;
 /*
 * FIELDS
@@ -130,8 +127,7 @@ typedef struct _osm_slvl_rcv
 *
 * SYNOPSIS
 */
-void osm_slvl_rcv_construct(
-	IN osm_slvl_rcv_t* const p_ctrl );
+void osm_slvl_rcv_construct(IN osm_slvl_rcv_t * const p_ctrl);
 /*
 * PARAMETERS
 *	p_ctrl
@@ -161,8 +157,7 @@ void osm_slvl_rcv_construct(
 *
 * SYNOPSIS
 */
-void osm_slvl_rcv_destroy(
-	IN osm_slvl_rcv_t* const p_ctrl );
+void osm_slvl_rcv_destroy(IN osm_slvl_rcv_t * const p_ctrl);
 /*
 * PARAMETERS
 *	p_ctrl
@@ -193,12 +188,11 @@ void osm_slvl_rcv_destroy(
 *
 * SYNOPSIS
 */
-ib_api_status_t osm_slvl_rcv_init(
-	IN osm_slvl_rcv_t* const p_ctrl,
-	IN osm_req_t* const p_req,
-	IN osm_subn_t* const p_subn,
-	IN osm_log_t* const p_log,
-	IN cl_plock_t* const p_lock );
+ib_api_status_t osm_slvl_rcv_init(IN osm_slvl_rcv_t * const p_ctrl,
+				  IN osm_req_t * const p_req,
+				  IN osm_subn_t * const p_subn,
+				  IN osm_log_t * const p_log,
+				  IN cl_plock_t * const p_lock);
 /*
 * PARAMETERS
 *	p_ctrl
@@ -237,9 +231,7 @@ ib_api_status_t osm_slvl_rcv_init(
 *
 * SYNOPSIS
 */
-void osm_slvl_rcv_process(
-	IN void* context,
-	IN void* p_data );
+void osm_slvl_rcv_process(IN void *context, IN void *p_data);
 /*
 * PARAMETERS
 *	context
@@ -260,5 +252,4 @@ void osm_slvl_rcv_process(
 *********/
 
 END_C_DECLS
-
-#endif	/* _OSM_SLVL_RCV_H_ */
+#endif				/* _OSM_SLVL_RCV_H_ */
diff --git a/opensm/include/opensm/osm_sm.h b/opensm/include/opensm/osm_sm.h
index a07dbd7..4811d2a 100644
--- a/opensm/include/opensm/osm_sm.h
+++ b/opensm/include/opensm/osm_sm.h
@@ -87,13 +87,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/SM
 * NAME
 *	SM
@@ -112,7 +111,6 @@ BEGIN_C_DECLS
 *	Steve King, Intel
 *
 *********/
-
 /****s* OpenSM: SM/osm_sm_t
 * NAME
 *  osm_sm_t
@@ -125,55 +123,54 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_sm
-{
-  osm_thread_state_t       thread_state;
-  cl_event_t               signal;
-  cl_event_t               subnet_up_event;
-  cl_thread_t              sweeper;
-  osm_subn_t               *p_subn;
-  osm_db_t                 *p_db;
-  osm_vendor_t             *p_vendor;
-  osm_log_t                *p_log;
-  osm_mad_pool_t           *p_mad_pool;
-  osm_vl15_t               *p_vl15;
-  cl_dispatcher_t          *p_disp;
-  cl_plock_t               *p_lock;
-  atomic32_t               sm_trans_id;
-  osm_req_t                req;
-  osm_resp_t               resp;
-  osm_ni_rcv_t             ni_rcv;
-  osm_pi_rcv_t             pi_rcv;
-  osm_nd_rcv_t             nd_rcv;
-  osm_sm_mad_ctrl_t        mad_ctrl;
-  osm_si_rcv_t             si_rcv;
-  osm_state_mgr_ctrl_t     state_mgr_ctrl;
-  osm_lid_mgr_t            lid_mgr;
-  osm_ucast_mgr_t          ucast_mgr;
-  osm_link_mgr_t           link_mgr;
-  osm_state_mgr_t          state_mgr;
-  osm_drop_mgr_t           drop_mgr;
-  osm_lft_rcv_t            lft_rcv;
-  osm_mft_rcv_t            mft_rcv;
-  osm_sweep_fail_ctrl_t    sweep_fail_ctrl;
-  osm_sminfo_rcv_t         sm_info_rcv;
-  osm_trap_rcv_t           trap_rcv;
-  osm_sm_state_mgr_t       sm_state_mgr;
-  osm_mcast_mgr_t          mcast_mgr;
-  osm_slvl_rcv_t           slvl_rcv;
-  osm_vla_rcv_t            vla_rcv;
-  osm_pkey_rcv_t           pkey_rcv;
-  cl_disp_reg_handle_t     ni_disp_h;
-  cl_disp_reg_handle_t     pi_disp_h;
-  cl_disp_reg_handle_t     nd_disp_h;
-  cl_disp_reg_handle_t     si_disp_h;
-  cl_disp_reg_handle_t     lft_disp_h;
-  cl_disp_reg_handle_t     mft_disp_h;
-  cl_disp_reg_handle_t     sm_info_disp_h;
-  cl_disp_reg_handle_t     trap_disp_h;
-  cl_disp_reg_handle_t     slvl_disp_h;
-  cl_disp_reg_handle_t     vla_disp_h;
-  cl_disp_reg_handle_t     pkey_disp_h;
+typedef struct _osm_sm {
+	osm_thread_state_t thread_state;
+	cl_event_t signal;
+	cl_event_t subnet_up_event;
+	cl_thread_t sweeper;
+	osm_subn_t *p_subn;
+	osm_db_t *p_db;
+	osm_vendor_t *p_vendor;
+	osm_log_t *p_log;
+	osm_mad_pool_t *p_mad_pool;
+	osm_vl15_t *p_vl15;
+	cl_dispatcher_t *p_disp;
+	cl_plock_t *p_lock;
+	atomic32_t sm_trans_id;
+	osm_req_t req;
+	osm_resp_t resp;
+	osm_ni_rcv_t ni_rcv;
+	osm_pi_rcv_t pi_rcv;
+	osm_nd_rcv_t nd_rcv;
+	osm_sm_mad_ctrl_t mad_ctrl;
+	osm_si_rcv_t si_rcv;
+	osm_state_mgr_ctrl_t state_mgr_ctrl;
+	osm_lid_mgr_t lid_mgr;
+	osm_ucast_mgr_t ucast_mgr;
+	osm_link_mgr_t link_mgr;
+	osm_state_mgr_t state_mgr;
+	osm_drop_mgr_t drop_mgr;
+	osm_lft_rcv_t lft_rcv;
+	osm_mft_rcv_t mft_rcv;
+	osm_sweep_fail_ctrl_t sweep_fail_ctrl;
+	osm_sminfo_rcv_t sm_info_rcv;
+	osm_trap_rcv_t trap_rcv;
+	osm_sm_state_mgr_t sm_state_mgr;
+	osm_mcast_mgr_t mcast_mgr;
+	osm_slvl_rcv_t slvl_rcv;
+	osm_vla_rcv_t vla_rcv;
+	osm_pkey_rcv_t pkey_rcv;
+	cl_disp_reg_handle_t ni_disp_h;
+	cl_disp_reg_handle_t pi_disp_h;
+	cl_disp_reg_handle_t nd_disp_h;
+	cl_disp_reg_handle_t si_disp_h;
+	cl_disp_reg_handle_t lft_disp_h;
+	cl_disp_reg_handle_t mft_disp_h;
+	cl_disp_reg_handle_t sm_info_disp_h;
+	cl_disp_reg_handle_t trap_disp_h;
+	cl_disp_reg_handle_t slvl_disp_h;
+	cl_disp_reg_handle_t vla_disp_h;
+	cl_disp_reg_handle_t pkey_disp_h;
 } osm_sm_t;
 /*
 * FIELDS
@@ -241,9 +238,7 @@ typedef struct _osm_sm
 *
 * SYNOPSIS
 */
-void
-osm_sm_construct(
-	IN osm_sm_t* const p_sm );
+void osm_sm_construct(IN osm_sm_t * const p_sm);
 /*
 * PARAMETERS
 *	p_sm
@@ -272,9 +267,7 @@ osm_sm_construct(
 *
 * SYNOPSIS
 */
-void
-osm_sm_shutdown(
-	IN osm_sm_t* const p_sm );
+void osm_sm_shutdown(IN osm_sm_t * const p_sm);
 /*
 * PARAMETERS
 *	p_sm
@@ -297,9 +290,7 @@ osm_sm_shutdown(
 *
 * SYNOPSIS
 */
-void
-osm_sm_destroy(
-	IN osm_sm_t* const p_sm );
+void osm_sm_destroy(IN osm_sm_t * const p_sm);
 /*
 * PARAMETERS
 *	p_sm
@@ -328,17 +319,15 @@ osm_sm_destroy(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_sm_init(
-	IN osm_sm_t* const p_sm,
-	IN osm_subn_t* const p_subn,
-   IN osm_db_t* const p_db,
-	IN osm_vendor_t* const p_vendor,
-	IN osm_mad_pool_t* const p_mad_pool,
-	IN osm_vl15_t* const p_vl15,
-	IN osm_log_t* const p_log,
-	IN osm_stats_t*	const p_stats,
-	IN cl_dispatcher_t* const p_disp,
-	IN cl_plock_t* const p_lock );
+osm_sm_init(IN osm_sm_t * const p_sm,
+	    IN osm_subn_t * const p_subn,
+	    IN osm_db_t * const p_db,
+	    IN osm_vendor_t * const p_vendor,
+	    IN osm_mad_pool_t * const p_mad_pool,
+	    IN osm_vl15_t * const p_vl15,
+	    IN osm_log_t * const p_log,
+	    IN osm_stats_t * const p_stats,
+	    IN cl_dispatcher_t * const p_disp, IN cl_plock_t * const p_lock);
 /*
 * PARAMETERS
 *	p_sm
@@ -387,9 +376,7 @@ osm_sm_init(
 *
 * SYNOPSIS
 */
-void
-osm_sm_sweep(
-	IN osm_sm_t* const p_sm );
+void osm_sm_sweep(IN osm_sm_t * const p_sm);
 /*
 * PARAMETERS
 *	p_sm
@@ -414,9 +401,7 @@ osm_sm_sweep(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_sm_bind(
-	IN osm_sm_t* const p_sm,
-	IN const ib_net64_t port_guid );
+osm_sm_bind(IN osm_sm_t * const p_sm, IN const ib_net64_t port_guid);
 /*
 * PARAMETERS
 *	p_sm
@@ -448,11 +433,10 @@ osm_sm_bind(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_sm_mcgrp_join(
-	IN osm_sm_t* const p_sm,
-	IN const ib_net16_t mlid,
-	IN const ib_net64_t port_guid,
-   IN osm_mcast_req_type_t req_type );
+osm_sm_mcgrp_join(IN osm_sm_t * const p_sm,
+		  IN const ib_net16_t mlid,
+		  IN const ib_net64_t port_guid,
+		  IN osm_mcast_req_type_t req_type);
 /*
 * PARAMETERS
 *	p_sm
@@ -488,10 +472,8 @@ osm_sm_mcgrp_join(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_sm_mcgrp_leave(
-	IN osm_sm_t* const p_sm,
-	IN const ib_net16_t mlid,
-	IN const ib_net64_t port_guid );
+osm_sm_mcgrp_leave(IN osm_sm_t * const p_sm,
+		   IN const ib_net16_t mlid, IN const ib_net64_t port_guid);
 /*
 * PARAMETERS
 *	p_sm
@@ -521,14 +503,14 @@ osm_sm_mcgrp_leave(
 * SYNOPSIS
 */
 static inline cl_status_t
-osm_sm_wait_for_subnet_up(
-	IN osm_sm_t*				const p_sm,
-	IN uint32_t				const wait_us,
-	IN boolean_t				const interruptible )
+osm_sm_wait_for_subnet_up(IN osm_sm_t * const p_sm,
+			  IN uint32_t const wait_us,
+			  IN boolean_t const interruptible)
 {
-	return( cl_event_wait_on( &p_sm->subnet_up_event,
-			wait_us, interruptible ) );
+	return (cl_event_wait_on(&p_sm->subnet_up_event,
+				 wait_us, interruptible));
 }
+
 /*
 * PARAMETERS
 *	p_sm
@@ -557,5 +539,4 @@ osm_sm_wait_for_subnet_up(
 *********/
 
 END_C_DECLS
-
-#endif		/* _OSM_SM_H_ */
+#endif				/* _OSM_SM_H_ */
diff --git a/opensm/include/opensm/osm_sm_mad_ctrl.h b/opensm/include/opensm/osm_sm_mad_ctrl.h
index 062fa2a..ccacb93 100644
--- a/opensm/include/opensm/osm_sm_mad_ctrl.h
+++ b/opensm/include/opensm/osm_sm_mad_ctrl.h
@@ -62,13 +62,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/SM MAD Controller
 * NAME
 *	SM MAD Controller
@@ -86,7 +85,6 @@ BEGIN_C_DECLS
 *	Steve King, Intel
 *
 *********/
-
 /****s* OpenSM: SM MAD Controller/osm_sm_mad_ctrl_t
 * NAME
 *	osm_sm_mad_ctrl_t
@@ -99,18 +97,17 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_sm_mad_ctrl
-{
-	osm_log_t				*p_log;
-	osm_subn_t				*p_subn;
-	osm_mad_pool_t				*p_mad_pool;
-	osm_vl15_t				*p_vl15;
-	osm_vendor_t				*p_vendor;
-	osm_bind_handle_t			h_bind;
-	cl_plock_t				*p_lock;
-	cl_dispatcher_t				*p_disp;
-	cl_disp_reg_handle_t			h_disp;
-	osm_stats_t				*p_stats;
+typedef struct _osm_sm_mad_ctrl {
+	osm_log_t *p_log;
+	osm_subn_t *p_subn;
+	osm_mad_pool_t *p_mad_pool;
+	osm_vl15_t *p_vl15;
+	osm_vendor_t *p_vendor;
+	osm_bind_handle_t h_bind;
+	cl_plock_t *p_lock;
+	cl_dispatcher_t *p_disp;
+	cl_disp_reg_handle_t h_disp;
+	osm_stats_t *p_stats;
 
 } osm_sm_mad_ctrl_t;
 /*
@@ -156,9 +153,7 @@ typedef struct _osm_sm_mad_ctrl
 *
 * SYNOPSIS
 */
-void
-osm_sm_mad_ctrl_construct(
-	IN osm_sm_mad_ctrl_t* const p_ctrl );
+void osm_sm_mad_ctrl_construct(IN osm_sm_mad_ctrl_t * const p_ctrl);
 /*
 * PARAMETERS
 *	p_ctrl
@@ -189,9 +184,7 @@ osm_sm_mad_ctrl_construct(
 *
 * SYNOPSIS
 */
-void
-osm_sm_mad_ctrl_destroy(
-	IN osm_sm_mad_ctrl_t* const p_ctrl );
+void osm_sm_mad_ctrl_destroy(IN osm_sm_mad_ctrl_t * const p_ctrl);
 /*
 * PARAMETERS
 *	p_ctrl
@@ -223,16 +216,15 @@ osm_sm_mad_ctrl_destroy(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_sm_mad_ctrl_init(
-	IN osm_sm_mad_ctrl_t* const p_ctrl,
-	IN osm_subn_t* const p_subn,
-	IN osm_mad_pool_t* const p_mad_pool,
-	IN osm_vl15_t* const p_vl15,
-	IN osm_vendor_t* const p_vendor,
-	IN osm_log_t* const p_log,
-	IN osm_stats_t* const p_stats,
-	IN cl_plock_t* const p_lock,
-	IN cl_dispatcher_t* const p_disp );
+osm_sm_mad_ctrl_init(IN osm_sm_mad_ctrl_t * const p_ctrl,
+		     IN osm_subn_t * const p_subn,
+		     IN osm_mad_pool_t * const p_mad_pool,
+		     IN osm_vl15_t * const p_vl15,
+		     IN osm_vendor_t * const p_vendor,
+		     IN osm_log_t * const p_log,
+		     IN osm_stats_t * const p_stats,
+		     IN cl_plock_t * const p_lock,
+		     IN cl_dispatcher_t * const p_disp);
 /*
 * PARAMETERS
 *	p_ctrl
@@ -281,9 +273,8 @@ osm_sm_mad_ctrl_init(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_sm_mad_ctrl_bind(
-	IN osm_sm_mad_ctrl_t* const p_ctrl,
-	IN const ib_net64_t port_guid );
+osm_sm_mad_ctrl_bind(IN osm_sm_mad_ctrl_t * const p_ctrl,
+		     IN const ib_net64_t port_guid);
 /*
 * PARAMETERS
 *	p_ctrl
@@ -313,11 +304,11 @@ osm_sm_mad_ctrl_bind(
 * SYNOPSIS
 */
 static inline osm_bind_handle_t
-osm_sm_mad_ctrl_get_bind_handle(
-	IN const osm_sm_mad_ctrl_t* const p_ctrl )
+osm_sm_mad_ctrl_get_bind_handle(IN const osm_sm_mad_ctrl_t * const p_ctrl)
 {
-	return( p_ctrl->h_bind );
+	return (p_ctrl->h_bind);
 }
+
 /*
 * PARAMETERS
 *	p_ctrl
@@ -335,5 +326,4 @@ osm_sm_mad_ctrl_get_bind_handle(
 *********/
 
 END_C_DECLS
-
-#endif	/* _OSM_SM_MAD_CTRL_H_ */
+#endif				/* _OSM_SM_MAD_CTRL_H_ */
diff --git a/opensm/include/opensm/osm_sm_state_mgr.h b/opensm/include/opensm/osm_sm_state_mgr.h
index e92bc04..ab2aaff 100644
--- a/opensm/include/opensm/osm_sm_state_mgr.h
+++ b/opensm/include/opensm/osm_sm_state_mgr.h
@@ -64,13 +64,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/SM State Manager
 * NAME
 *	SM State Manager
@@ -88,7 +87,6 @@ BEGIN_C_DECLS
 *	Yael Kalka, Mellanox
 *
 *********/
-
 /****s* OpenSM: SM State Manager/osm_sm_state_mgr_t
 * NAME
 *	osm_sm_state_mgr_t
@@ -101,17 +99,16 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_sm_state_mgr
-{
-	cl_spinlock_t    state_lock;
-	cl_timer_t       polling_timer;
-	uint32_t         retry_number;
-	ib_net64_t       master_guid;
-	osm_state_mgr_t* p_state_mgr;
-	osm_subn_t*      p_subn;
-	osm_req_t*       p_req;
-	osm_log_t*       p_log;
-	osm_remote_sm_t* p_polling_sm;
+typedef struct _osm_sm_state_mgr {
+	cl_spinlock_t state_lock;
+	cl_timer_t polling_timer;
+	uint32_t retry_number;
+	ib_net64_t master_guid;
+	osm_state_mgr_t *p_state_mgr;
+	osm_subn_t *p_subn;
+	osm_req_t *p_req;
+	osm_log_t *p_log;
+	osm_remote_sm_t *p_polling_sm;
 } osm_sm_state_mgr_t;
 
 /*
@@ -159,9 +156,7 @@ typedef struct _osm_sm_state_mgr
 *
 * SYNOPSIS
 */
-void
-osm_sm_state_mgr_construct(
-	IN osm_sm_state_mgr_t* const p_sm_mgr );
+void osm_sm_state_mgr_construct(IN osm_sm_state_mgr_t * const p_sm_mgr);
 /*
 * PARAMETERS
 *	p_sm_mgr
@@ -191,9 +186,7 @@ osm_sm_state_mgr_construct(
 *
 * SYNOPSIS
 */
-void
-osm_sm_state_mgr_destroy(
-	IN osm_sm_state_mgr_t* const p_sm_mgr );
+void osm_sm_state_mgr_destroy(IN osm_sm_state_mgr_t * const p_sm_mgr);
 /*
 * PARAMETERS
 *	p_sm_mgr
@@ -225,12 +218,10 @@ osm_sm_state_mgr_destroy(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_sm_state_mgr_init(
-	IN osm_sm_state_mgr_t*	const p_sm_mgr,
-	IN osm_state_mgr_t*     const p_state_mgr,
-	IN osm_subn_t*				const p_subn,
-	IN osm_req_t*           const p_req,
-	IN osm_log_t*				const p_log );
+osm_sm_state_mgr_init(IN osm_sm_state_mgr_t * const p_sm_mgr,
+		      IN osm_state_mgr_t * const p_state_mgr,
+		      IN osm_subn_t * const p_subn,
+		      IN osm_req_t * const p_req, IN osm_log_t * const p_log);
 /*
 * PARAMETERS
 *	p_sm_mgr
@@ -271,9 +262,8 @@ osm_sm_state_mgr_init(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_sm_state_mgr_process(
-	IN osm_sm_state_mgr_t* const p_sm_mgr,
-	IN osm_sm_signal_t signal );
+osm_sm_state_mgr_process(IN osm_sm_state_mgr_t * const p_sm_mgr,
+			 IN osm_sm_signal_t signal);
 /*
 * PARAMETERS
 *	p_sm_mgr
@@ -291,7 +281,6 @@ osm_sm_state_mgr_process(
 *	State Manager
 *********/
 
-
 /****f* OpenSM: SM State Manager/osm_sm_state_mgr_signal_master_is_alive
 * NAME
 *	osm_sm_state_mgr_signal_master_is_alive
@@ -303,8 +292,7 @@ osm_sm_state_mgr_process(
 * SYNOPSIS
 */
 void
-osm_sm_state_mgr_signal_master_is_alive(
-		IN osm_sm_state_mgr_t* const p_sm_mgr );
+osm_sm_state_mgr_signal_master_is_alive(IN osm_sm_state_mgr_t * const p_sm_mgr);
 /*
 * PARAMETERS
 *	p_sm_mgr
@@ -330,9 +318,8 @@ osm_sm_state_mgr_signal_master_is_alive(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_sm_state_mgr_check_legality(
-	IN osm_sm_state_mgr_t* const p_sm_mgr,
-	IN osm_sm_signal_t signal );
+osm_sm_state_mgr_check_legality(IN osm_sm_state_mgr_t * const p_sm_mgr,
+				IN osm_sm_signal_t signal);
 /*
 * PARAMETERS
 *	p_sm_mgr
@@ -351,5 +338,4 @@ osm_sm_state_mgr_check_legality(
 *********/
 
 END_C_DECLS
-
-#endif	/* _OSM_SM_STATE_MGR_H_ */
+#endif				/* _OSM_SM_STATE_MGR_H_ */
diff --git a/opensm/include/opensm/osm_sminfo_rcv.h b/opensm/include/opensm/osm_sminfo_rcv.h
index 0d9ffc0..1cbf2e6 100644
--- a/opensm/include/opensm/osm_sminfo_rcv.h
+++ b/opensm/include/opensm/osm_sminfo_rcv.h
@@ -61,13 +61,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/SMInfo Receiver
 * NAME
 *	SMInfo Receiver
@@ -85,7 +84,6 @@ BEGIN_C_DECLS
 *	Steve King, Intel
 *
 *********/
-
 /****s* OpenSM: SMInfo Receiver/osm_sminfo_rcv_t
 * NAME
 *	osm_sminfo_rcv_t
@@ -98,15 +96,14 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_sminfo_rcv
-{
-	osm_subn_t			*p_subn;
-	osm_stats_t			*p_stats;
-	osm_log_t			*p_log;
-	osm_resp_t			*p_resp;
-	osm_state_mgr_t			*p_state_mgr;
-	struct _osm_sm_state_mgr	*p_sm_state_mgr;
-	cl_plock_t			*p_lock;
+typedef struct _osm_sminfo_rcv {
+	osm_subn_t *p_subn;
+	osm_stats_t *p_stats;
+	osm_log_t *p_log;
+	osm_resp_t *p_resp;
+	osm_state_mgr_t *p_state_mgr;
+	struct _osm_sm_state_mgr *p_sm_state_mgr;
+	cl_plock_t *p_lock;
 } osm_sminfo_rcv_t;
 /*
 * FIELDS
@@ -144,8 +141,7 @@ typedef struct _osm_sminfo_rcv
 *
 * SYNOPSIS
 */
-void osm_sminfo_rcv_construct(
-	IN osm_sminfo_rcv_t* const p_rcv );
+void osm_sminfo_rcv_construct(IN osm_sminfo_rcv_t * const p_rcv);
 /*
 * PARAMETERS
 *	p_rcv
@@ -175,8 +171,7 @@ void osm_sminfo_rcv_construct(
 *
 * SYNOPSIS
 */
-void osm_sminfo_rcv_destroy(
-	IN osm_sminfo_rcv_t* const p_rcv );
+void osm_sminfo_rcv_destroy(IN osm_sminfo_rcv_t * const p_rcv);
 /*
 * PARAMETERS
 *	p_rcv
@@ -207,15 +202,15 @@ void osm_sminfo_rcv_destroy(
 *
 * SYNOPSIS
 */
-ib_api_status_t osm_sminfo_rcv_init(
-	IN osm_sminfo_rcv_t* const p_rcv,
-	IN osm_subn_t* const p_subn,
-	IN osm_stats_t* const p_stats,
-	IN osm_resp_t* const p_resp,
-	IN osm_log_t* const p_log,
-	IN osm_state_mgr_t* const p_state_mgr,
-	IN struct _osm_sm_state_mgr* const p_sm_state_mgr,
-	IN cl_plock_t* const p_lock );
+ib_api_status_t osm_sminfo_rcv_init(IN osm_sminfo_rcv_t * const p_rcv,
+				    IN osm_subn_t * const p_subn,
+				    IN osm_stats_t * const p_stats,
+				    IN osm_resp_t * const p_resp,
+				    IN osm_log_t * const p_log,
+				    IN osm_state_mgr_t * const p_state_mgr,
+				    IN struct _osm_sm_state_mgr *const
+				    p_sm_state_mgr,
+				    IN cl_plock_t * const p_lock);
 /*
 * PARAMETERS
 *	p_rcv
@@ -263,9 +258,7 @@ ib_api_status_t osm_sminfo_rcv_init(
 *
 * SYNOPSIS
 */
-void osm_sminfo_rcv_process(
-	IN void *context,
-	IN void *data );
+void osm_sminfo_rcv_process(IN void *context, IN void *data);
 /*
 * PARAMETERS
 *	context
@@ -286,5 +279,4 @@ void osm_sminfo_rcv_process(
 *********/
 
 END_C_DECLS
-
-#endif	/* _OSM_SMINFO_RCV_H_ */
+#endif				/* _OSM_SMINFO_RCV_H_ */
diff --git a/opensm/include/opensm/osm_state_mgr.h b/opensm/include/opensm/osm_state_mgr.h
index 99383ee..5b45a91 100644
--- a/opensm/include/opensm/osm_state_mgr.h
+++ b/opensm/include/opensm/osm_state_mgr.h
@@ -62,13 +62,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/State Manager
 * NAME
 *	State Manager
@@ -86,7 +85,6 @@ BEGIN_C_DECLS
 *	Steve King, Intel
 *
 *********/
-
 /****s* OpenSM: State Manager/osm_state_mgr_t
 * NAME
 *	osm_state_mgr_t
@@ -99,25 +97,24 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_state_mgr
-{
-  osm_subn_t					*p_subn;
-  osm_log_t					*p_log;
-  osm_lid_mgr_t				*p_lid_mgr;
-  osm_ucast_mgr_t			*p_ucast_mgr;
-  osm_mcast_mgr_t			*p_mcast_mgr;
-  osm_link_mgr_t				*p_link_mgr;
-  osm_drop_mgr_t				*p_drop_mgr;
-  osm_req_t					*p_req;
-  osm_stats_t					*p_stats;
-  struct _osm_sm_state_mgr  *p_sm_state_mgr;
-  const osm_sm_mad_ctrl_t	*p_mad_ctrl;
-  cl_spinlock_t				state_lock;
-  cl_spinlock_t				idle_lock;
-  cl_qlist_t					idle_time_list;
-  cl_plock_t					*p_lock;
-  cl_event_t					*p_subnet_up_event;
-  osm_sm_state_t				state;
+typedef struct _osm_state_mgr {
+	osm_subn_t *p_subn;
+	osm_log_t *p_log;
+	osm_lid_mgr_t *p_lid_mgr;
+	osm_ucast_mgr_t *p_ucast_mgr;
+	osm_mcast_mgr_t *p_mcast_mgr;
+	osm_link_mgr_t *p_link_mgr;
+	osm_drop_mgr_t *p_drop_mgr;
+	osm_req_t *p_req;
+	osm_stats_t *p_stats;
+	struct _osm_sm_state_mgr *p_sm_state_mgr;
+	const osm_sm_mad_ctrl_t *p_mad_ctrl;
+	cl_spinlock_t state_lock;
+	cl_spinlock_t idle_lock;
+	cl_qlist_t idle_time_list;
+	cl_plock_t *p_lock;
+	cl_event_t *p_subnet_up_event;
+	osm_sm_state_t state;
 } osm_state_mgr_t;
 /*
 * FIELDS
@@ -189,24 +186,18 @@ typedef struct _osm_state_mgr
 * SYNOPSIS
 */
 
-typedef osm_signal_t
-(*osm_pfn_start_t)(
-	IN				void						*context1,
-	IN				void						*context2 );
+typedef osm_signal_t(*osm_pfn_start_t) (IN void *context1, IN void *context2);
 
 typedef void
-(*osm_pfn_done_t)(
-	IN				void						*context1,
-	IN				void						*context2 );
+ (*osm_pfn_done_t) (IN void *context1, IN void *context2);
 
-typedef struct _osm_idle_item
-{
-	cl_list_item_t	list_item;
-	void*			context1;
-	void*			context2;
-	osm_pfn_start_t	pfn_start;
-	osm_pfn_done_t	pfn_done;
-}osm_idle_item_t;
+typedef struct _osm_idle_item {
+	cl_list_item_t list_item;
+	void *context1;
+	void *context2;
+	osm_pfn_start_t pfn_start;
+	osm_pfn_done_t pfn_done;
+} osm_idle_item_t;
 
 /*
 * FIELDS
@@ -240,13 +231,10 @@ typedef struct _osm_idle_item
 */
 
 ib_api_status_t
-osm_state_mgr_process_idle(
-	IN osm_state_mgr_t* const p_mgr,
-	IN osm_pfn_start_t	pfn_start,
-	IN osm_pfn_done_t	pfn_done,
-	void*			context1,
-	void*			context2
-	);
+osm_state_mgr_process_idle(IN osm_state_mgr_t * const p_mgr,
+			   IN osm_pfn_start_t pfn_start,
+			   IN osm_pfn_done_t pfn_done,
+			   void *context1, void *context2);
 
 /*
 * PARAMETERS
@@ -290,9 +278,7 @@ osm_state_mgr_process_idle(
 *
 * SYNOPSIS
 */
-void
-osm_state_mgr_construct(
-	IN osm_state_mgr_t* const p_mgr );
+void osm_state_mgr_construct(IN osm_state_mgr_t * const p_mgr);
 /*
 * PARAMETERS
 *	p_mgr
@@ -322,9 +308,7 @@ osm_state_mgr_construct(
 *
 * SYNOPSIS
 */
-void
-osm_state_mgr_destroy(
-	IN osm_state_mgr_t* const p_mgr );
+void osm_state_mgr_destroy(IN osm_state_mgr_t * const p_mgr);
 /*
 * PARAMETERS
 *	p_mgr
@@ -356,21 +340,20 @@ osm_state_mgr_destroy(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_state_mgr_init(
-	IN osm_state_mgr_t*			const p_mgr,
-	IN osm_subn_t*				const p_subn,
-	IN osm_lid_mgr_t*			const p_lid_mgr,
-	IN osm_ucast_mgr_t*			const p_ucast_mgr,
-	IN osm_mcast_mgr_t*			const p_mcast_mgr,
-	IN osm_link_mgr_t*			const p_link_mgr,
-	IN osm_drop_mgr_t*			const p_drop_mgr,
-	IN osm_req_t*				const p_req,
-   IN osm_stats_t*               const p_stats,
-   IN struct _osm_sm_state_mgr*  const p_sm_state_mgr,
-	IN const osm_sm_mad_ctrl_t* const p_mad_ctrl,
-	IN cl_plock_t*				const p_lock,
-	IN cl_event_t*				const p_subnet_up_event,
-	IN osm_log_t*				const p_log );
+osm_state_mgr_init(IN osm_state_mgr_t * const p_mgr,
+		   IN osm_subn_t * const p_subn,
+		   IN osm_lid_mgr_t * const p_lid_mgr,
+		   IN osm_ucast_mgr_t * const p_ucast_mgr,
+		   IN osm_mcast_mgr_t * const p_mcast_mgr,
+		   IN osm_link_mgr_t * const p_link_mgr,
+		   IN osm_drop_mgr_t * const p_drop_mgr,
+		   IN osm_req_t * const p_req,
+		   IN osm_stats_t * const p_stats,
+		   IN struct _osm_sm_state_mgr *const p_sm_state_mgr,
+		   IN const osm_sm_mad_ctrl_t * const p_mad_ctrl,
+		   IN cl_plock_t * const p_lock,
+		   IN cl_event_t * const p_subnet_up_event,
+		   IN osm_log_t * const p_log);
 /*
 * PARAMETERS
 *	p_mgr
@@ -434,28 +417,22 @@ osm_state_mgr_init(
 * SYNOPSIS
 */
 static inline boolean_t
-osm_sm_is_greater_than (
-  IN const uint8_t    l_priority,
-  IN const ib_net64_t l_guid,
-  IN const uint8_t    r_priority,
-  IN const ib_net64_t r_guid )
+osm_sm_is_greater_than(IN const uint8_t l_priority,
+		       IN const ib_net64_t l_guid,
+		       IN const uint8_t r_priority, IN const ib_net64_t r_guid)
 {
-  if( l_priority > r_priority )
-  {
-    return( TRUE );
-  }
-  else
-  {
-    if( l_priority == r_priority )
-    {
-      if( cl_ntoh64(l_guid) <  cl_ntoh64(r_guid) )
-      {
-        return( TRUE );
-      }
-    }
-  }
-  return( FALSE );
+	if (l_priority > r_priority) {
+		return (TRUE);
+	} else {
+		if (l_priority == r_priority) {
+			if (cl_ntoh64(l_guid) < cl_ntoh64(r_guid)) {
+				return (TRUE);
+			}
+		}
+	}
+	return (FALSE);
 }
+
 /*
 * PARAMETERS
 *	l_priority
@@ -491,9 +468,7 @@ osm_sm_is_greater_than (
 * SYNOPSIS
 */
 void
-osm_state_mgr_process(
-	IN osm_state_mgr_t* const p_mgr,
-	IN osm_signal_t signal );
+osm_state_mgr_process(IN osm_state_mgr_t * const p_mgr, IN osm_signal_t signal);
 /*
 * PARAMETERS
 *	p_mgr
@@ -512,5 +487,4 @@ osm_state_mgr_process(
 *********/
 
 END_C_DECLS
-
-#endif	/* _OSM_STATE_MGR_H_ */
+#endif				/* _OSM_STATE_MGR_H_ */
diff --git a/opensm/include/opensm/osm_state_mgr_ctrl.h b/opensm/include/opensm/osm_state_mgr_ctrl.h
index 0837e33..4751335 100644
--- a/opensm/include/opensm/osm_state_mgr_ctrl.h
+++ b/opensm/include/opensm/osm_state_mgr_ctrl.h
@@ -57,13 +57,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/State Manager Controller
 * NAME
 *	State Manager Controller
@@ -82,7 +81,6 @@ BEGIN_C_DECLS
 *	Steve King, Intel
 *
 *********/
-
 /****s* OpenSM: State Manager Controller/osm_state_mgr_ctrl_t
 * NAME
 *	osm_state_mgr_ctrl_t
@@ -95,12 +93,11 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_state_mgr_ctrl
-{
-	osm_state_mgr_t				*p_mgr;
-	osm_log_t					*p_log;
-	cl_dispatcher_t				*p_disp;
-	cl_disp_reg_handle_t		h_disp;
+typedef struct _osm_state_mgr_ctrl {
+	osm_state_mgr_t *p_mgr;
+	osm_log_t *p_log;
+	cl_dispatcher_t *p_disp;
+	cl_disp_reg_handle_t h_disp;
 
 } osm_state_mgr_ctrl_t;
 /*
@@ -130,9 +127,7 @@ typedef struct _osm_state_mgr_ctrl
 *
 * SYNOPSIS
 */
-void
-osm_state_mgr_ctrl_construct(
-	IN osm_state_mgr_ctrl_t* const p_ctrl );
+void osm_state_mgr_ctrl_construct(IN osm_state_mgr_ctrl_t * const p_ctrl);
 /*
 * PARAMETERS
 *	p_ctrl
@@ -163,9 +158,7 @@ osm_state_mgr_ctrl_construct(
 *
 * SYNOPSIS
 */
-void
-osm_state_mgr_ctrl_destroy(
-	IN osm_state_mgr_ctrl_t* const p_ctrl );
+void osm_state_mgr_ctrl_destroy(IN osm_state_mgr_ctrl_t * const p_ctrl);
 /*
 * PARAMETERS
 *	p_ctrl
@@ -197,11 +190,10 @@ osm_state_mgr_ctrl_destroy(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_state_mgr_ctrl_init(
-	IN osm_state_mgr_ctrl_t* const p_ctrl,
-	IN osm_state_mgr_t* const p_mgr,
-	IN osm_log_t* const p_log,
-	IN cl_dispatcher_t* const p_disp );
+osm_state_mgr_ctrl_init(IN osm_state_mgr_ctrl_t * const p_ctrl,
+			IN osm_state_mgr_t * const p_mgr,
+			IN osm_log_t * const p_log,
+			IN cl_dispatcher_t * const p_disp);
 /*
 * PARAMETERS
 *	p_ctrl
@@ -229,5 +221,4 @@ osm_state_mgr_ctrl_init(
 *********/
 
 END_C_DECLS
-
-#endif		/* OSM_STATE_MGR_CTRL_H_ */
+#endif				/* OSM_STATE_MGR_CTRL_H_ */
diff --git a/opensm/include/opensm/osm_stats.h b/opensm/include/opensm/osm_stats.h
index f86ef8b..2d2fa14 100644
--- a/opensm/include/opensm/osm_stats.h
+++ b/opensm/include/opensm/osm_stats.h
@@ -54,13 +54,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/Statistics
 * NAME
 *	OpenSM
@@ -73,7 +72,6 @@ BEGIN_C_DECLS
 *	Steve King, Intel
 *
 *********/
-
 /****s* OpenSM: Statistics/osm_stats_t
 * NAME
 *	osm_stats_t
@@ -83,16 +81,15 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_stats
-{
-	atomic32_t					qp0_mads_outstanding;
-	atomic32_t					qp0_mads_outstanding_on_wire;
-	atomic32_t					qp0_mads_rcvd;
-	atomic32_t					qp0_mads_sent;
-	atomic32_t					qp0_unicasts_sent;
-	atomic32_t					sa_mads_outstanding;
-	atomic32_t					sa_mads_rcvd;
-	atomic32_t					sa_mads_sent;
+typedef struct _osm_stats {
+	atomic32_t qp0_mads_outstanding;
+	atomic32_t qp0_mads_outstanding_on_wire;
+	atomic32_t qp0_mads_rcvd;
+	atomic32_t qp0_mads_sent;
+	atomic32_t qp0_unicasts_sent;
+	atomic32_t sa_mads_outstanding;
+	atomic32_t sa_mads_rcvd;
+	atomic32_t sa_mads_sent;
 
 } osm_stats_t;
 /*
@@ -121,5 +118,4 @@ typedef struct _osm_stats
 ***************/
 
 END_C_DECLS
-
-#endif	/* _OSM_STATS_H_ */
+#endif				/* _OSM_STATS_H_ */
diff --git a/opensm/include/opensm/osm_subnet.h b/opensm/include/opensm/osm_subnet.h
index 277db7a..a7543dc 100644
--- a/opensm/include/opensm/osm_subnet.h
+++ b/opensm/include/opensm/osm_subnet.h
@@ -58,17 +58,15 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 #define OSM_SUBNET_VECTOR_MIN_SIZE			0
 #define OSM_SUBNET_VECTOR_GROW_SIZE			1
 #define OSM_SUBNET_VECTOR_CAPACITY			256
-
 struct _osm_opensm_t;
 
 /****h* OpenSM/Subnet
@@ -103,8 +101,7 @@ struct _osm_opensm_t;
 * SYNOPSIS
 */
 typedef int
-(*osm_pfn_ui_extension_t)(
-	IN	void*				context );
+ (*osm_pfn_ui_extension_t) (IN void *context);
 /*
 * PARAMETERS
 *	context
@@ -130,11 +127,10 @@ typedef int
 * SYNOPSIS
 */
 typedef void
-(*osm_pfn_ui_mcast_extension_t)(
-  IN void                 *context,
-  IN ib_net16_t            mlid,
-  IN osm_mcast_req_type_t  request_type,
-  IN ib_net64_t            port_guid );
+ (*osm_pfn_ui_mcast_extension_t) (IN void *context,
+				  IN ib_net16_t mlid,
+				  IN osm_mcast_req_type_t request_type,
+				  IN ib_net64_t port_guid);
 /*
 * PARAMETERS
 *  context
@@ -167,11 +163,10 @@ typedef void
 *
 * SYNOPSIS
 */
-typedef enum _osm_testability_modes
-{
-  OSM_TEST_MODE_NONE = 0,
-  OSM_TEST_MODE_EXIT_BEFORE_SEND_HANDOVER,
-  OSM_TEST_MODE_MAX
+typedef enum _osm_testability_modes {
+	OSM_TEST_MODE_NONE = 0,
+	OSM_TEST_MODE_EXIT_BEFORE_SEND_HANDOVER,
+	OSM_TEST_MODE_MAX
 } osm_testability_modes_t;
 /***********/
 
@@ -186,11 +181,11 @@ typedef enum _osm_testability_modes
 * SYNOPSIS
 */
 typedef struct _osm_qos_options_t {
-  unsigned max_vls;
-  unsigned high_limit;
-  char *vlarb_high;
-  char *vlarb_low;
-  char *sl2vl;
+	unsigned max_vls;
+	unsigned high_limit;
+	char *vlarb_high;
+	char *vlarb_low;
+	char *sl2vl;
 } osm_qos_options_t;
 /*
 * FIELDS
@@ -223,84 +218,83 @@ typedef struct _osm_qos_options_t {
 *
 * SYNOPSIS
 */
-typedef struct _osm_subn_opt
-{
-  ib_net64_t               guid;
-  ib_net64_t		   m_key;
-  ib_net64_t               sm_key;
-  ib_net64_t		   subnet_prefix;
-  ib_net16_t		   m_key_lease_period;
-  uint32_t		   sweep_interval;
-  uint32_t		   max_wire_smps;
-  uint32_t		   transaction_timeout;
-  uint8_t		   sm_priority;
-  uint8_t		   lmc;
-  boolean_t		   lmc_esp0;
-  uint8_t		   max_op_vls;
-  uint8_t		   force_link_speed;
-  boolean_t		   reassign_lids;
-  boolean_t		   ignore_other_sm;
-  boolean_t		   single_thread;
-  boolean_t		   no_multicast_option;
-  boolean_t		   disable_multicast;
-  boolean_t		   force_log_flush;
-  uint8_t                  subnet_timeout;
-  uint8_t                  packet_life_time;
-  uint8_t                  vl_stall_count;
-  uint8_t                  leaf_vl_stall_count;
-  uint8_t                  head_of_queue_lifetime;
-  uint8_t                  leaf_head_of_queue_lifetime;
-  uint8_t                  local_phy_errors_threshold;
-  uint8_t                  overrun_errors_threshold;
-  uint32_t                 sminfo_polling_timeout;
-  uint32_t                 polling_retry_number;
-  uint32_t		   max_msg_fifo_timeout;
-  boolean_t                force_heavy_sweep;
-  uint8_t                  log_flags;
-  char *                   dump_files_dir;
-  char *                   log_file;
-  unsigned long            log_max_size;
-  char *                   partition_config_file;
-  boolean_t                no_partition_enforcement;
-  boolean_t                no_qos;
-  boolean_t                accum_log_file;
-  char *                   console;
-  uint16_t                 console_port;
-  cl_map_t                 port_prof_ignore_guids;
-  boolean_t                port_profile_switch_nodes;
-  osm_pfn_ui_extension_t   pfn_ui_pre_lid_assign;
-  void *                   ui_pre_lid_assign_ctx;
-  osm_pfn_ui_mcast_extension_t pfn_ui_mcast_fdb_assign;
-  void *                   ui_mcast_fdb_assign_ctx;
-  boolean_t                sweep_on_trap;
-  osm_testability_modes_t  testability_mode;
-  char *                   routing_engine_name;
-  boolean_t                connect_roots;
-  char *                   lid_matrix_dump_file;
-  char *                   ucast_dump_file;
-  char *                   root_guid_file;
-  char *                   cn_guid_file;
-  char *                   sa_db_file;
-  boolean_t                exit_on_fatal;
-  boolean_t                honor_guid2lid_file;
-  boolean_t                daemon;
-  boolean_t                sm_inactive;
-  boolean_t                babbling_port_policy;
-  osm_qos_options_t        qos_options;
-  osm_qos_options_t        qos_ca_options;
-  osm_qos_options_t        qos_sw0_options;
-  osm_qos_options_t        qos_swe_options;
-  osm_qos_options_t        qos_rtr_options;
-  boolean_t                enable_quirks;
-  boolean_t                no_clients_rereg;
+typedef struct _osm_subn_opt {
+	ib_net64_t guid;
+	ib_net64_t m_key;
+	ib_net64_t sm_key;
+	ib_net64_t subnet_prefix;
+	ib_net16_t m_key_lease_period;
+	uint32_t sweep_interval;
+	uint32_t max_wire_smps;
+	uint32_t transaction_timeout;
+	uint8_t sm_priority;
+	uint8_t lmc;
+	boolean_t lmc_esp0;
+	uint8_t max_op_vls;
+	uint8_t force_link_speed;
+	boolean_t reassign_lids;
+	boolean_t ignore_other_sm;
+	boolean_t single_thread;
+	boolean_t no_multicast_option;
+	boolean_t disable_multicast;
+	boolean_t force_log_flush;
+	uint8_t subnet_timeout;
+	uint8_t packet_life_time;
+	uint8_t vl_stall_count;
+	uint8_t leaf_vl_stall_count;
+	uint8_t head_of_queue_lifetime;
+	uint8_t leaf_head_of_queue_lifetime;
+	uint8_t local_phy_errors_threshold;
+	uint8_t overrun_errors_threshold;
+	uint32_t sminfo_polling_timeout;
+	uint32_t polling_retry_number;
+	uint32_t max_msg_fifo_timeout;
+	boolean_t force_heavy_sweep;
+	uint8_t log_flags;
+	char *dump_files_dir;
+	char *log_file;
+	unsigned long log_max_size;
+	char *partition_config_file;
+	boolean_t no_partition_enforcement;
+	boolean_t no_qos;
+	boolean_t accum_log_file;
+	char *console;
+	uint16_t console_port;
+	cl_map_t port_prof_ignore_guids;
+	boolean_t port_profile_switch_nodes;
+	osm_pfn_ui_extension_t pfn_ui_pre_lid_assign;
+	void *ui_pre_lid_assign_ctx;
+	osm_pfn_ui_mcast_extension_t pfn_ui_mcast_fdb_assign;
+	void *ui_mcast_fdb_assign_ctx;
+	boolean_t sweep_on_trap;
+	osm_testability_modes_t testability_mode;
+	char *routing_engine_name;
+	boolean_t connect_roots;
+	char *lid_matrix_dump_file;
+	char *ucast_dump_file;
+	char *root_guid_file;
+	char *cn_guid_file;
+	char *sa_db_file;
+	boolean_t exit_on_fatal;
+	boolean_t honor_guid2lid_file;
+	boolean_t daemon;
+	boolean_t sm_inactive;
+	boolean_t babbling_port_policy;
+	osm_qos_options_t qos_options;
+	osm_qos_options_t qos_ca_options;
+	osm_qos_options_t qos_sw0_options;
+	osm_qos_options_t qos_swe_options;
+	osm_qos_options_t qos_rtr_options;
+	boolean_t enable_quirks;
+	boolean_t no_clients_rereg;
 #ifdef ENABLE_OSM_PERF_MGR
-  boolean_t                perfmgr;
-  boolean_t                perfmgr_redir;
-  uint16_t                 perfmgr_sweep_time_s;
-  uint32_t                 perfmgr_max_outstanding_queries;
-  char *                   event_db_dump_file;
-#endif /* ENABLE_OSM_PERF_MGR */
-  char *                   event_plugin_name;
+	boolean_t perfmgr;
+	boolean_t perfmgr_redir;
+	uint16_t perfmgr_sweep_time_s;
+	uint32_t perfmgr_max_outstanding_queries;
+	char *event_db_dump_file;
+#endif				/* ENABLE_OSM_PERF_MGR */
+	char *event_plugin_name;
 } osm_subn_opt_t;
 /*
 * FIELDS
@@ -540,37 +534,36 @@ typedef struct _osm_subn_opt
 *
 * SYNOPSIS
 */
-typedef struct _osm_subn
-{
-  struct _osm_opensm_t    *p_osm;
-  cl_qmap_t		   sw_guid_tbl;
-  cl_qmap_t		   node_guid_tbl;
-  cl_qmap_t		   port_guid_tbl;
-  cl_qmap_t		   rtr_guid_tbl;
-  cl_qmap_t		   prtn_pkey_tbl;
-  cl_qmap_t		   mgrp_mlid_tbl;
-  cl_qmap_t		   sm_guid_tbl;
-  cl_qlist_t		   sa_sr_list;
-  cl_qlist_t		   sa_infr_list;
-  cl_ptr_vector_t	   port_lid_tbl;
-  ib_net16_t		   master_sm_base_lid;
-  ib_net16_t		   sm_base_lid;
-  ib_net64_t		   sm_port_guid;
-  uint8_t		   sm_state;
-  osm_subn_opt_t	   opt;
-  uint16_t		   max_unicast_lid_ho;
-  uint16_t		   max_multicast_lid_ho;
-  uint8_t                  min_ca_mtu;
-  uint8_t                  min_ca_rate;
-  boolean_t                ignore_existing_lfts;
-  boolean_t                subnet_initialization_error;
-  boolean_t                force_immediate_heavy_sweep;
-  boolean_t                force_delayed_heavy_sweep;
-  boolean_t                in_sweep_hop_0;
-  boolean_t                moved_to_master_state;
-  boolean_t                first_time_master_sweep;
-  boolean_t                coming_out_of_standby;
-  unsigned                 need_update;
+typedef struct _osm_subn {
+	struct _osm_opensm_t *p_osm;
+	cl_qmap_t sw_guid_tbl;
+	cl_qmap_t node_guid_tbl;
+	cl_qmap_t port_guid_tbl;
+	cl_qmap_t rtr_guid_tbl;
+	cl_qmap_t prtn_pkey_tbl;
+	cl_qmap_t mgrp_mlid_tbl;
+	cl_qmap_t sm_guid_tbl;
+	cl_qlist_t sa_sr_list;
+	cl_qlist_t sa_infr_list;
+	cl_ptr_vector_t port_lid_tbl;
+	ib_net16_t master_sm_base_lid;
+	ib_net16_t sm_base_lid;
+	ib_net64_t sm_port_guid;
+	uint8_t sm_state;
+	osm_subn_opt_t opt;
+	uint16_t max_unicast_lid_ho;
+	uint16_t max_multicast_lid_ho;
+	uint8_t min_ca_mtu;
+	uint8_t min_ca_rate;
+	boolean_t ignore_existing_lfts;
+	boolean_t subnet_initialization_error;
+	boolean_t force_immediate_heavy_sweep;
+	boolean_t force_delayed_heavy_sweep;
+	boolean_t in_sweep_hop_0;
+	boolean_t moved_to_master_state;
+	boolean_t first_time_master_sweep;
+	boolean_t coming_out_of_standby;
+	unsigned need_update;
 } osm_subn_t;
 /*
 * FIELDS
@@ -716,9 +709,7 @@ typedef struct _osm_subn
 *
 * SYNOPSIS
 */
-void
-osm_subn_construct(
-	IN osm_subn_t* const p_subn );
+void osm_subn_construct(IN osm_subn_t * const p_subn);
 /*
 * PARAMETERS
 *	p_subn
@@ -747,9 +738,7 @@ osm_subn_construct(
 *
 * SYNOPSIS
 */
-void
-osm_subn_destroy(
-	IN osm_subn_t* const p_subn );
+void osm_subn_destroy(IN osm_subn_t * const p_subn);
 /*
 * PARAMETERS
 *	p_subn
@@ -778,10 +767,9 @@ osm_subn_destroy(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_subn_init(
-	IN osm_subn_t* const p_subn,
-	IN struct _osm_opensm_t * const p_osm,
-	IN const osm_subn_opt_t* const p_opt );
+osm_subn_init(IN osm_subn_t * const p_subn,
+	      IN struct _osm_opensm_t *const p_osm,
+	      IN const osm_subn_opt_t * const p_opt);
 /*
 * PARAMETERS
 *	p_subn
@@ -822,11 +810,10 @@ struct _osm_port;
 * SYNOPSIS
 */
 ib_api_status_t
-osm_get_gid_by_mad_addr(
-   IN struct _osm_log      *p_log,
-   IN const osm_subn_t     *p_subn,
-   IN const struct _osm_mad_addr *p_mad_addr,
-   OUT ib_gid_t            *p_gid);
+osm_get_gid_by_mad_addr(IN struct _osm_log *p_log,
+			IN const osm_subn_t * p_subn,
+			IN const struct _osm_mad_addr *p_mad_addr,
+			OUT ib_gid_t * p_gid);
 /*
 * PARAMETERS
 *  p_log
@@ -861,11 +848,10 @@ osm_get_gid_by_mad_addr(
 *
 * SYNOPSIS
 */
-struct _osm_physp *
-osm_get_physp_by_mad_addr(
-   IN struct _osm_log      *p_log,
-   IN const osm_subn_t     *p_subn,
-   IN struct _osm_mad_addr *p_mad_addr );
+struct _osm_physp *osm_get_physp_by_mad_addr(IN struct _osm_log *p_log,
+					     IN const osm_subn_t * p_subn,
+					     IN struct _osm_mad_addr
+					     *p_mad_addr);
 /*
 * PARAMETERS
 *  p_log
@@ -897,11 +883,9 @@ osm_get_physp_by_mad_addr(
 *
 * SYNOPSIS
 */
-struct _osm_port *
-osm_get_port_by_mad_addr(
-   IN struct _osm_log      *p_log,
-   IN const osm_subn_t     *p_subn,
-   IN struct _osm_mad_addr *p_mad_addr );
+struct _osm_port *osm_get_port_by_mad_addr(IN struct _osm_log *p_log,
+					   IN const osm_subn_t * p_subn,
+					   IN struct _osm_mad_addr *p_mad_addr);
 /*
 * PARAMETERS
 *  p_log
@@ -932,10 +916,8 @@ osm_get_port_by_mad_addr(
 *
 * SYNOPSIS
 */
-struct _osm_switch *
-osm_get_switch_by_guid(
-   IN const osm_subn_t *p_subn,
-   IN uint64_t          guid );
+struct _osm_switch *osm_get_switch_by_guid(IN const osm_subn_t * p_subn,
+					   IN uint64_t guid);
 /*
 * PARAMETERS
 *	p_subn
@@ -963,10 +945,8 @@ osm_get_switch_by_guid(
 *
 * SYNOPSIS
 */
-struct _osm_node *
-osm_get_node_by_guid(
-   IN osm_subn_t  const *p_subn,
-   IN uint64_t    guid );
+struct _osm_node *osm_get_node_by_guid(IN osm_subn_t const *p_subn,
+				       IN uint64_t guid);
 /*
 * PARAMETERS
 *	p_subn
@@ -994,10 +974,8 @@ osm_get_node_by_guid(
 *
 * SYNOPSIS
 */
-struct _osm_port *
-osm_get_port_by_guid(
-   IN osm_subn_t  const *p_subn,
-   IN uint64_t    guid );
+struct _osm_port *osm_get_port_by_guid(IN osm_subn_t const *p_subn,
+				       IN uint64_t guid);
 /*
 * PARAMETERS
 *	p_subn
@@ -1026,11 +1004,10 @@ osm_get_port_by_guid(
 *
 * SYNOPSIS
 */
-struct _osm_physp *
-osm_get_physp_by_mad_addr(
-   IN struct _osm_log      *p_log,
-   IN const osm_subn_t     *p_subn,
-   IN struct _osm_mad_addr *p_mad_addr );
+struct _osm_physp *osm_get_physp_by_mad_addr(IN struct _osm_log *p_log,
+					     IN const osm_subn_t * p_subn,
+					     IN struct _osm_mad_addr
+					     *p_mad_addr);
 /*
 * PARAMETERS
 *  p_log
@@ -1059,9 +1036,7 @@ osm_get_physp_by_mad_addr(
 *
 * SYNOPSIS
 */
-void
-osm_subn_set_default_opt(
-	IN osm_subn_opt_t* const p_opt );
+void osm_subn_set_default_opt(IN osm_subn_opt_t * const p_opt);
 /*
 * PARAMETERS
 *
@@ -1086,9 +1061,7 @@ osm_subn_set_default_opt(
 *
 * SYNOPSIS
 */
-void
-osm_subn_set_default_opt(
-	IN osm_subn_opt_t* const p_opt );
+void osm_subn_set_default_opt(IN osm_subn_opt_t * const p_opt);
 /*
 * PARAMETERS
 *
@@ -1114,9 +1087,7 @@ osm_subn_set_default_opt(
 *
 * SYNOPSIS
 */
-ib_api_status_t
-osm_subn_parse_conf_file(
-  IN osm_subn_opt_t* const p_opt );
+ib_api_status_t osm_subn_parse_conf_file(IN osm_subn_opt_t * const p_opt);
 /*
 * PARAMETERS
 *
@@ -1144,9 +1115,7 @@ osm_subn_parse_conf_file(
 *
 * SYNOPSIS
 */
-ib_api_status_t
-osm_subn_rescan_conf_file(
-  IN osm_subn_opt_t* const p_opts );
+ib_api_status_t osm_subn_rescan_conf_file(IN osm_subn_opt_t * const p_opts);
 /*
 * PARAMETERS
 *
@@ -1170,9 +1139,7 @@ osm_subn_rescan_conf_file(
 *
 * SYNOPSIS
 */
-ib_api_status_t
-osm_subn_write_conf_file(
-  IN osm_subn_opt_t* const p_opt );
+ib_api_status_t osm_subn_write_conf_file(IN osm_subn_opt_t * const p_opt);
 /*
 * PARAMETERS
 *
@@ -1191,5 +1158,4 @@ osm_subn_write_conf_file(
 *********/
 
 END_C_DECLS
-
-#endif /* _OSM_SUBNET_H_ */
+#endif				/* _OSM_SUBNET_H_ */
diff --git a/opensm/include/opensm/osm_sw_info_rcv.h b/opensm/include/opensm/osm_sw_info_rcv.h
index 41b4238..724d0d3 100644
--- a/opensm/include/opensm/osm_sw_info_rcv.h
+++ b/opensm/include/opensm/osm_sw_info_rcv.h
@@ -60,13 +60,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/Switch Info Receiver
 * NAME
 *	Switch Info Receiver
@@ -84,7 +83,6 @@ BEGIN_C_DECLS
 *	Steve King, Intel
 *
 *********/
-
 /****s* OpenSM: Switch Info Receiver/osm_si_rcv_t
 * NAME
 *	osm_si_rcv_t
@@ -97,13 +95,12 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_si_rcv
-{
-	osm_subn_t	*p_subn;
-	osm_log_t	*p_log;
-	osm_req_t	*p_req;
-	osm_state_mgr_t	*p_state_mgr;
-	cl_plock_t	*p_lock;
+typedef struct _osm_si_rcv {
+	osm_subn_t *p_subn;
+	osm_log_t *p_log;
+	osm_req_t *p_req;
+	osm_state_mgr_t *p_state_mgr;
+	cl_plock_t *p_lock;
 } osm_si_rcv_t;
 /*
 * FIELDS
@@ -135,8 +132,7 @@ typedef struct _osm_si_rcv
 *
 * SYNOPSIS
 */
-void osm_si_rcv_construct(
-	IN osm_si_rcv_t* const p_ctrl );
+void osm_si_rcv_construct(IN osm_si_rcv_t * const p_ctrl);
 /*
 * PARAMETERS
 *	p_ctrl
@@ -167,8 +163,7 @@ void osm_si_rcv_construct(
 *
 * SYNOPSIS
 */
-void osm_si_rcv_destroy(
-	IN osm_si_rcv_t* const p_ctrl );
+void osm_si_rcv_destroy(IN osm_si_rcv_t * const p_ctrl);
 /*
 * PARAMETERS
 *	p_ctrl
@@ -199,13 +194,12 @@ void osm_si_rcv_destroy(
 *
 * SYNOPSIS
 */
-ib_api_status_t osm_si_rcv_init(
-	IN osm_si_rcv_t* const p_ctrl,
-	IN osm_subn_t* const p_subn,
-	IN osm_log_t* const p_log,
-	IN osm_req_t* const p_req,
-	IN osm_state_mgr_t* const p_state_mgr,
-	IN cl_plock_t* const p_lock );
+ib_api_status_t osm_si_rcv_init(IN osm_si_rcv_t * const p_ctrl,
+				IN osm_subn_t * const p_subn,
+				IN osm_log_t * const p_log,
+				IN osm_req_t * const p_req,
+				IN osm_state_mgr_t * const p_state_mgr,
+				IN cl_plock_t * const p_lock);
 /*
 * PARAMETERS
 *	p_ctrl
@@ -247,8 +241,7 @@ ib_api_status_t osm_si_rcv_init(
 *
 * SYNOPSIS
 */
-boolean_t osm_si_rcv_is_inited(
-	IN const osm_si_rcv_t* const p_ctrl );
+boolean_t osm_si_rcv_is_inited(IN const osm_si_rcv_t * const p_ctrl);
 /*
 * PARAMETERS
 *	p_ctrl
@@ -276,9 +269,7 @@ boolean_t osm_si_rcv_is_inited(
 *
 * SYNOPSIS
 */
-void osm_si_rcv_process(
-	IN void *context,
-	IN void *data );
+void osm_si_rcv_process(IN void *context, IN void *data);
 /*
 * PARAMETERS
 *	context
@@ -299,5 +290,4 @@ void osm_si_rcv_process(
 *********/
 
 END_C_DECLS
-
-#endif	/* _OSM_SI_RCV_H_ */
+#endif				/* _OSM_SI_RCV_H_ */
diff --git a/opensm/include/opensm/osm_sweep_fail_ctrl.h b/opensm/include/opensm/osm_sweep_fail_ctrl.h
index 30f748e..579ef58 100644
--- a/opensm/include/opensm/osm_sweep_fail_ctrl.h
+++ b/opensm/include/opensm/osm_sweep_fail_ctrl.h
@@ -58,13 +58,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/Sweep Fail Controller
 * NAME
 *	Sweep Fail Controller
@@ -83,7 +82,6 @@ BEGIN_C_DECLS
 *	Steve King, Intel
 *
 *********/
-
 /****s* OpenSM: Sweep Fail Controller/osm_sweep_fail_ctrl_t
 * NAME
 *	osm_sweep_fail_ctrl_t
@@ -96,13 +94,11 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_sweep_fail_ctrl
-{
-	osm_log_t					*p_log;
-	osm_state_mgr_t				*p_state_mgr;
-	cl_dispatcher_t				*p_disp;
-	cl_disp_reg_handle_t		h_disp;
-
+typedef struct _osm_sweep_fail_ctrl {
+	osm_log_t *p_log;
+	osm_state_mgr_t *p_state_mgr;
+	cl_dispatcher_t *p_disp;
+	cl_disp_reg_handle_t h_disp;
 
 } osm_sweep_fail_ctrl_t;
 /*
@@ -133,9 +129,7 @@ typedef struct _osm_sweep_fail_ctrl
 *
 * SYNOPSIS
 */
-void
-osm_sweep_fail_ctrl_construct(
-	IN osm_sweep_fail_ctrl_t* const p_ctrl );
+void osm_sweep_fail_ctrl_construct(IN osm_sweep_fail_ctrl_t * const p_ctrl);
 /*
 * PARAMETERS
 *	p_ctrl
@@ -166,9 +160,7 @@ osm_sweep_fail_ctrl_construct(
 *
 * SYNOPSIS
 */
-void
-osm_sweep_fail_ctrl_destroy(
-	IN osm_sweep_fail_ctrl_t* const p_ctrl );
+void osm_sweep_fail_ctrl_destroy(IN osm_sweep_fail_ctrl_t * const p_ctrl);
 /*
 * PARAMETERS
 *	p_ctrl
@@ -200,11 +192,10 @@ osm_sweep_fail_ctrl_destroy(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_sweep_fail_ctrl_init(
-	IN osm_sweep_fail_ctrl_t* const p_ctrl,
-	IN osm_log_t* const p_log,
-	IN osm_state_mgr_t* const p_state_mgr,
-	IN cl_dispatcher_t* const p_disp );
+osm_sweep_fail_ctrl_init(IN osm_sweep_fail_ctrl_t * const p_ctrl,
+			 IN osm_log_t * const p_log,
+			 IN osm_state_mgr_t * const p_state_mgr,
+			 IN cl_dispatcher_t * const p_disp);
 /*
 * PARAMETERS
 *	p_ctrl
@@ -235,5 +226,4 @@ osm_sweep_fail_ctrl_init(
 *********/
 
 END_C_DECLS
-
-#endif	/* _OSM_SWEEP_FAIL_CTRL_H_ */
+#endif				/* _OSM_SWEEP_FAIL_CTRL_H_ */
diff --git a/opensm/include/opensm/osm_switch.h b/opensm/include/opensm/osm_switch.h
index 9364d2c..e294527 100644
--- a/opensm/include/opensm/osm_switch.h
+++ b/opensm/include/opensm/osm_switch.h
@@ -60,13 +60,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/Switch
 * NAME
 *	Switch
@@ -86,7 +85,6 @@ BEGIN_C_DECLS
 *	Steve King, Intel
 *
 *********/
-
 /****s* OpenSM: Switch/osm_switch_t
 * NAME
 *	osm_switch_t
@@ -99,21 +97,20 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_switch
-{
-	cl_map_item_t				map_item;
-	osm_node_t				*p_node;
-	ib_switch_info_t			switch_info;
-	uint16_t				max_lid_ho;
-	uint8_t					num_ports;
-	uint16_t				num_hops;
-	uint8_t					**hops;
-	osm_port_profile_t			*p_prof;
-	osm_fwd_tbl_t				fwd_tbl;
-	osm_mcast_tbl_t				mcast_tbl;
-	uint32_t				discovery_count;
-	unsigned				need_update;
-	void					*priv;
+typedef struct _osm_switch {
+	cl_map_item_t map_item;
+	osm_node_t *p_node;
+	ib_switch_info_t switch_info;
+	uint16_t max_lid_ho;
+	uint8_t num_ports;
+	uint16_t num_hops;
+	uint8_t **hops;
+	osm_port_profile_t *p_prof;
+	osm_fwd_tbl_t fwd_tbl;
+	osm_mcast_tbl_t mcast_tbl;
+	uint32_t discovery_count;
+	unsigned need_update;
+	void *priv;
 } osm_switch_t;
 /*
 * FIELDS
@@ -170,9 +167,7 @@ typedef struct _osm_switch
 *
 * SYNOPSIS
 */
-void
-osm_switch_delete(
-	IN OUT osm_switch_t** const pp_sw );
+void osm_switch_delete(IN OUT osm_switch_t ** const pp_sw);
 /*
 * PARAMETERS
 *	p_sw
@@ -196,10 +191,8 @@ osm_switch_delete(
 *
 * SYNOPSIS
 */
-osm_switch_t*
-osm_switch_new(
-	IN osm_node_t* const p_node,
-	IN const osm_madw_t* const p_madw );
+osm_switch_t *osm_switch_new(IN osm_node_t * const p_node,
+			     IN const osm_madw_t * const p_madw);
 /*
 * PARAMETERS
 *	p_node
@@ -228,14 +221,13 @@ osm_switch_new(
 * SYNOPSIS
 */
 static inline uint8_t
-osm_switch_get_hop_count(
-	IN const osm_switch_t* const p_sw,
-	IN const uint16_t lid_ho,
-	IN const uint8_t port_num )
+osm_switch_get_hop_count(IN const osm_switch_t * const p_sw,
+			 IN const uint16_t lid_ho, IN const uint8_t port_num)
 {
 	return (lid_ho > p_sw->max_lid_ho || !p_sw->hops[lid_ho]) ?
-		OSM_NO_PATH : p_sw->hops[lid_ho][port_num];
+	    OSM_NO_PATH : p_sw->hops[lid_ho][port_num];
 }
+
 /*
 * PARAMETERS
 *	p_sw
@@ -264,12 +256,12 @@ osm_switch_get_hop_count(
 *
 * SYNOPSIS
 */
-static inline osm_fwd_tbl_t*
-osm_switch_get_fwd_tbl_ptr(
-	IN const osm_switch_t* const p_sw )
+static inline osm_fwd_tbl_t *osm_switch_get_fwd_tbl_ptr(IN const osm_switch_t *
+							const p_sw)
 {
-	return( (osm_fwd_tbl_t*)&p_sw->fwd_tbl );
+	return ((osm_fwd_tbl_t *) & p_sw->fwd_tbl);
 }
+
 /*
 * PARAMETERS
 *	p_sw
@@ -293,11 +285,9 @@ osm_switch_get_fwd_tbl_ptr(
 * SYNOPSIS
 */
 cl_status_t
-osm_switch_set_hops(
-	IN osm_switch_t* const p_sw,
-	IN const uint16_t lid_ho,
-	IN const uint8_t port_num,
-	IN const uint8_t num_hops );
+osm_switch_set_hops(IN osm_switch_t * const p_sw,
+		    IN const uint16_t lid_ho,
+		    IN const uint8_t port_num, IN const uint8_t num_hops);
 /*
 * PARAMETERS
 *	p_sw
@@ -329,9 +319,7 @@ osm_switch_set_hops(
 *
 * SYNOPSIS
 */
-void
-osm_switch_clear_hops(
-	IN osm_switch_t *p_sw );
+void osm_switch_clear_hops(IN osm_switch_t * p_sw);
 /*
 * PARAMETERS
 *	p_sw
@@ -353,13 +341,13 @@ osm_switch_clear_hops(
 * SYNOPSIS
 */
 static inline uint8_t
-osm_switch_get_least_hops(
-	IN const osm_switch_t* const p_sw,
-	IN const uint16_t lid_ho )
+osm_switch_get_least_hops(IN const osm_switch_t * const p_sw,
+			  IN const uint16_t lid_ho)
 {
 	return (lid_ho > p_sw->max_lid_ho || !p_sw->hops[lid_ho]) ?
-		OSM_NO_PATH : p_sw->hops[lid_ho][0];
+	    OSM_NO_PATH : p_sw->hops[lid_ho][0];
 }
+
 /*
 * PARAMETERS
 *	p_sw
@@ -389,9 +377,8 @@ osm_switch_get_least_hops(
 * SYNOPSIS
 */
 uint8_t
-osm_switch_get_port_least_hops(
-	IN const osm_switch_t* const p_sw,
-	IN const osm_port_t *p_port );
+osm_switch_get_port_least_hops(IN const osm_switch_t * const p_sw,
+			       IN const osm_port_t * p_port);
 /*
 * PARAMETERS
 *	p_sw
@@ -421,12 +408,12 @@ osm_switch_get_port_least_hops(
 * SYNOPSIS
 */
 static inline uint8_t
-osm_switch_get_port_by_lid(
-	IN const osm_switch_t* const p_sw,
-	IN const uint16_t lid_ho )
+osm_switch_get_port_by_lid(IN const osm_switch_t * const p_sw,
+			   IN const uint16_t lid_ho)
 {
-	return( osm_fwd_tbl_get( &p_sw->fwd_tbl, lid_ho ) );
+	return (osm_fwd_tbl_get(&p_sw->fwd_tbl, lid_ho));
 }
+
 /*
 * PARAMETERS
 *	p_sw
@@ -453,10 +440,8 @@ osm_switch_get_port_by_lid(
 *
 * SYNOPSIS
 */
-osm_physp_t*
-osm_switch_get_physp_ptr(
-	IN const osm_switch_t* const p_sw,
-	IN const uint32_t port_num );
+osm_physp_t *osm_switch_get_physp_ptr(IN const osm_switch_t * const p_sw,
+				      IN const uint32_t port_num);
 /*
 * PARAMETERS
 *	p_sw
@@ -486,29 +471,29 @@ osm_switch_get_physp_ptr(
 *
 * SYNOPSIS
 */
-static inline osm_physp_t*
-osm_switch_get_route_by_lid(
-	IN const osm_switch_t* const p_sw,
-	IN const ib_net16_t lid )
+static inline osm_physp_t *osm_switch_get_route_by_lid(IN const osm_switch_t *
+						       const p_sw,
+						       IN const ib_net16_t lid)
 {
 	uint8_t port_num;
 
-	CL_ASSERT( p_sw );
-	CL_ASSERT( lid );
+	CL_ASSERT(p_sw);
+	CL_ASSERT(lid);
 
-	port_num = osm_fwd_tbl_get( &p_sw->fwd_tbl, cl_ntoh16( lid ) );
+	port_num = osm_fwd_tbl_get(&p_sw->fwd_tbl, cl_ntoh16(lid));
 	/*
 	   In order to avoid holes in the subnet (usually happens when
 	   running UPDN algorithm), i.e. cases where port is
 	   unreachable through a switch (we put an OSM_NO_PATH value at
 	   the port entry, we do not assert on unreachable lid entries
 	   at the fwd table but return NULL
-	*/
+	 */
 	if (port_num != OSM_NO_PATH)
-		return( osm_node_get_physp_ptr( p_sw->p_node, port_num ) );
+		return (osm_node_get_physp_ptr(p_sw->p_node, port_num));
 	else
 		return NULL;
 }
+
 /*
 * PARAMETERS
 *	p_sw
@@ -539,13 +524,13 @@ osm_switch_get_route_by_lid(
 *
 */
 static inline unsigned
-osm_switch_sp0_is_lmc_capable(
-	IN const osm_switch_t* const p_sw,
-	IN osm_subn_t *p_subn)
+osm_switch_sp0_is_lmc_capable(IN const osm_switch_t * const p_sw,
+			      IN osm_subn_t * p_subn)
 {
 	return (p_subn->opt.lmc_esp0 &&
 		ib_switch_info_is_enhanced_port0(&p_sw->switch_info)) ? 1 : 0;
 }
+
 /*
 * PARAMETERS
 *	p_sw
@@ -574,12 +559,12 @@ osm_switch_sp0_is_lmc_capable(
 * SYNOPSIS
 */
 static inline uint32_t
-osm_switch_get_max_block_id(
-	IN const osm_switch_t* const p_sw )
+osm_switch_get_max_block_id(IN const osm_switch_t * const p_sw)
 {
-	return( (uint32_t)(osm_fwd_tbl_get_size( &p_sw->fwd_tbl ) /
-		osm_fwd_tbl_get_lids_per_block( &p_sw->fwd_tbl ) ) );
+	return ((uint32_t) (osm_fwd_tbl_get_size(&p_sw->fwd_tbl) /
+			    osm_fwd_tbl_get_lids_per_block(&p_sw->fwd_tbl)));
 }
+
 /*
 * PARAMETERS
 *	p_sw
@@ -605,12 +590,13 @@ osm_switch_get_max_block_id(
 * SYNOPSIS
 */
 static inline uint16_t
-osm_switch_get_max_block_id_in_use(
-	IN const osm_switch_t* const p_sw )
+osm_switch_get_max_block_id_in_use(IN const osm_switch_t * const p_sw)
 {
-	return( osm_fwd_tbl_get_max_block_id_in_use( &p_sw->fwd_tbl,
-			cl_ntoh16( p_sw->switch_info.lin_top ) ) );
+	return (osm_fwd_tbl_get_max_block_id_in_use(&p_sw->fwd_tbl,
+						    cl_ntoh16(p_sw->switch_info.
+							      lin_top)));
 }
+
 /*
 * PARAMETERS
 *	p_sw
@@ -635,10 +621,9 @@ osm_switch_get_max_block_id_in_use(
 * SYNOPSIS
 */
 boolean_t
-osm_switch_get_fwd_tbl_block(
-	IN const osm_switch_t* const p_sw,
-	IN const uint32_t block_id,
-	OUT uint8_t* const p_block );
+osm_switch_get_fwd_tbl_block(IN const osm_switch_t * const p_sw,
+			     IN const uint32_t block_id,
+			     OUT uint8_t * const p_block);
 /*
 * PARAMETERS
 *	p_sw
@@ -671,11 +656,11 @@ osm_switch_get_fwd_tbl_block(
 * SYNOPSIS
 */
 static inline boolean_t
-osm_switch_supports_mcast(
-	IN const osm_switch_t* const p_sw )
+osm_switch_supports_mcast(IN const osm_switch_t * const p_sw)
 {
-	return( p_sw->switch_info.mcast_cap != 0 );
+	return (p_sw->switch_info.mcast_cap != 0);
 }
+
 /*
 * PARAMETERS
 *	p_sw
@@ -700,14 +685,14 @@ osm_switch_supports_mcast(
 * SYNOPSIS
 */
 static inline void
-osm_switch_set_switch_info(
-	IN osm_switch_t* const p_sw,
-	IN const ib_switch_info_t* const p_si )
+osm_switch_set_switch_info(IN osm_switch_t * const p_sw,
+			   IN const ib_switch_info_t * const p_si)
 {
-	CL_ASSERT( p_sw );
-	CL_ASSERT( p_si );
+	CL_ASSERT(p_sw);
+	CL_ASSERT(p_si);
 	p_sw->switch_info = *p_si;
 }
+
 /*
 * PARAMETERS
 *	p_sw
@@ -734,12 +719,11 @@ osm_switch_set_switch_info(
 * SYNOPSIS
 */
 static inline void
-osm_switch_count_path(
-	IN osm_switch_t* const p_sw,
-	IN const uint8_t port )
+osm_switch_count_path(IN osm_switch_t * const p_sw, IN const uint8_t port)
 {
-	  osm_port_prof_path_count_inc( &p_sw->p_prof[port] );
+	osm_port_prof_path_count_inc(&p_sw->p_prof[port]);
 }
+
 /*
 * PARAMETERS
 *	p_sw
@@ -766,14 +750,14 @@ osm_switch_count_path(
 * SYNOPSIS
 */
 static inline ib_api_status_t
-osm_switch_set_ft_block(
-	IN osm_switch_t* const p_sw,
-	IN const uint8_t* const p_block,
-	IN const uint32_t block_num )
+osm_switch_set_ft_block(IN osm_switch_t * const p_sw,
+			IN const uint8_t * const p_block,
+			IN const uint32_t block_num)
 {
-	CL_ASSERT( p_sw );
-	return( osm_fwd_tbl_set_block( &p_sw->fwd_tbl, p_block, block_num ) );
+	CL_ASSERT(p_sw);
+	return (osm_fwd_tbl_set_block(&p_sw->fwd_tbl, p_block, block_num));
 }
+
 /*
 * PARAMETERS
 *	p_sw
@@ -803,16 +787,15 @@ osm_switch_set_ft_block(
 * SYNOPSIS
 */
 static inline ib_api_status_t
-osm_switch_set_mft_block(
-	IN osm_switch_t* const p_sw,
-	IN const ib_net16_t* const p_block,
-	IN const uint16_t block_num,
-	IN const uint8_t position )
+osm_switch_set_mft_block(IN osm_switch_t * const p_sw,
+			 IN const ib_net16_t * const p_block,
+			 IN const uint16_t block_num, IN const uint8_t position)
 {
-	CL_ASSERT( p_sw );
-	return( osm_mcast_tbl_set_block( &p_sw->mcast_tbl, p_block,
-			block_num, position ) );
+	CL_ASSERT(p_sw);
+	return (osm_mcast_tbl_set_block(&p_sw->mcast_tbl, p_block,
+					block_num, position));
 }
+
 /*
 * PARAMETERS
 *	p_sw
@@ -845,16 +828,16 @@ osm_switch_set_mft_block(
 * SYNOPSIS
 */
 static inline boolean_t
-osm_switch_get_mft_block(
-	IN osm_switch_t* const p_sw,
-	IN const uint16_t block_num,
-	IN const uint8_t position,
-	OUT ib_net16_t* const p_block )
+osm_switch_get_mft_block(IN osm_switch_t * const p_sw,
+			 IN const uint16_t block_num,
+			 IN const uint8_t position,
+			 OUT ib_net16_t * const p_block)
 {
-	CL_ASSERT( p_sw );
-	return( osm_mcast_tbl_get_block( &p_sw->mcast_tbl,
-			block_num, position, p_block ) );
+	CL_ASSERT(p_sw);
+	return (osm_mcast_tbl_get_block(&p_sw->mcast_tbl,
+					block_num, position, p_block));
 }
+
 /*
 * PARAMETERS
 *	p_sw
@@ -889,12 +872,12 @@ osm_switch_get_mft_block(
 * SYNOPSIS
 */
 static inline uint16_t
-osm_switch_get_mft_max_block(
-	IN osm_switch_t* const p_sw )
+osm_switch_get_mft_max_block(IN osm_switch_t * const p_sw)
 {
-	CL_ASSERT( p_sw );
-	return( osm_mcast_tbl_get_max_block( &p_sw->mcast_tbl ) );
+	CL_ASSERT(p_sw);
+	return (osm_mcast_tbl_get_max_block(&p_sw->mcast_tbl));
 }
+
 /*
 * PARAMETERS
 *	p_sw
@@ -913,12 +896,12 @@ osm_switch_get_mft_max_block(
 * SYNOPSIS
 */
 static inline int16_t
-osm_switch_get_mft_max_block_in_use(
-	IN osm_switch_t* const p_sw )
+osm_switch_get_mft_max_block_in_use(IN osm_switch_t * const p_sw)
 {
-	CL_ASSERT( p_sw );
-	return( osm_mcast_tbl_get_max_block_in_use( &p_sw->mcast_tbl ) );
+	CL_ASSERT(p_sw);
+	return (osm_mcast_tbl_get_max_block_in_use(&p_sw->mcast_tbl));
 }
+
 /*
 * PARAMETERS
 *	p_sw
@@ -943,12 +926,12 @@ osm_switch_get_mft_max_block_in_use(
 * SYNOPSIS
 */
 static inline uint8_t
-osm_switch_get_mft_max_position(
-	IN osm_switch_t* const p_sw )
+osm_switch_get_mft_max_position(IN osm_switch_t * const p_sw)
 {
-	CL_ASSERT( p_sw );
-	return( osm_mcast_tbl_get_max_position( &p_sw->mcast_tbl ) );
+	CL_ASSERT(p_sw);
+	return (osm_mcast_tbl_get_max_position(&p_sw->mcast_tbl));
 }
+
 /*
 * PARAMETERS
 *	p_sw
@@ -971,15 +954,14 @@ osm_switch_get_mft_max_position(
 * SYNOPSIS
 */
 uint8_t
-osm_switch_recommend_path(
-	IN const osm_switch_t* const p_sw,
-	IN osm_port_t *p_port,
-	IN const uint16_t lid_ho,
-	IN const boolean_t ignore_existing,
-	IN OUT uint64_t *remote_sys_guids,
-	IN OUT uint16_t *p_num_used_sys,
-	IN OUT uint64_t *remote_node_guids,
-	IN OUT uint16_t *p_num_used_nodes );
+osm_switch_recommend_path(IN const osm_switch_t * const p_sw,
+			  IN osm_port_t * p_port,
+			  IN const uint16_t lid_ho,
+			  IN const boolean_t ignore_existing,
+			  IN OUT uint64_t * remote_sys_guids,
+			  IN OUT uint16_t * p_num_used_sys,
+			  IN OUT uint64_t * remote_node_guids,
+			  IN OUT uint16_t * p_num_used_nodes);
 /*
 * PARAMETERS
 *	p_sw
@@ -1032,11 +1014,10 @@ osm_switch_recommend_path(
 * SYNOPSIS
 */
 uint8_t
-osm_switch_recommend_mcast_path(
-	IN osm_switch_t* const p_sw,
-	IN osm_port_t *p_port,
-	IN const uint16_t mlid_ho,
-	IN const boolean_t ignore_existing );
+osm_switch_recommend_mcast_path(IN osm_switch_t * const p_sw,
+				IN osm_port_t * p_port,
+				IN const uint16_t mlid_ho,
+				IN const boolean_t ignore_existing);
 /*
 * PARAMETERS
 *	p_sw
@@ -1073,11 +1054,11 @@ osm_switch_recommend_mcast_path(
 * SYNOPSIS
 */
 static inline uint16_t
-osm_switch_get_fwd_tbl_size(
-	IN const osm_switch_t* const p_sw )
+osm_switch_get_fwd_tbl_size(IN const osm_switch_t * const p_sw)
 {
-	return( osm_fwd_tbl_get_size( &p_sw->fwd_tbl ) );
+	return (osm_fwd_tbl_get_size(&p_sw->fwd_tbl));
 }
+
 /*
 * PARAMETERS
 *	p_sw
@@ -1101,11 +1082,11 @@ osm_switch_get_fwd_tbl_size(
 * SYNOPSIS
 */
 static inline uint16_t
-osm_switch_get_mcast_fwd_tbl_size(
-	IN const osm_switch_t* const p_sw )
+osm_switch_get_mcast_fwd_tbl_size(IN const osm_switch_t * const p_sw)
 {
-	return( cl_ntoh16( p_sw->switch_info.mcast_cap ) );
+	return (cl_ntoh16(p_sw->switch_info.mcast_cap));
 }
+
 /*
 * PARAMETERS
 *	p_sw
@@ -1129,12 +1110,12 @@ osm_switch_get_mcast_fwd_tbl_size(
 * SYNOPSIS
 */
 static inline uint32_t
-osm_switch_path_count_get(
-	IN const osm_switch_t* const p_sw,
-	IN const uint8_t port_num )
+osm_switch_path_count_get(IN const osm_switch_t * const p_sw,
+			  IN const uint8_t port_num)
 {
-	return( osm_port_prof_path_count_get( &p_sw->p_prof[port_num] ) );
+	return (osm_port_prof_path_count_get(&p_sw->p_prof[port_num]));
 }
+
 /*
 * PARAMETERS
 *	p_sw
@@ -1161,9 +1142,7 @@ osm_switch_path_count_get(
 * SYNOPSIS
 */
 int
-osm_switch_prepare_path_rebuild(
-	IN osm_switch_t* p_sw,
-	IN uint16_t max_lids );
+osm_switch_prepare_path_rebuild(IN osm_switch_t * p_sw, IN uint16_t max_lids);
 /*
 * PARAMETERS
 *	p_sw
@@ -1189,12 +1168,13 @@ osm_switch_prepare_path_rebuild(
 *
 * SYNOPSIS
 */
-static inline osm_mcast_tbl_t*
-osm_switch_get_mcast_tbl_ptr(
-	IN const osm_switch_t* const p_sw )
+static inline osm_mcast_tbl_t *osm_switch_get_mcast_tbl_ptr(IN const
+							    osm_switch_t *
+							    const p_sw)
 {
-	return( (osm_mcast_tbl_t*)&p_sw->mcast_tbl );
+	return ((osm_mcast_tbl_t *) & p_sw->mcast_tbl);
 }
+
 /*
 * PARAMETERS
 *	p_sw
@@ -1219,18 +1199,18 @@ osm_switch_get_mcast_tbl_ptr(
 * SYNOPSIS
 */
 static inline boolean_t
-osm_switch_is_in_mcast_tree(
-	IN const osm_switch_t* const p_sw,
-	IN const uint16_t mlid_ho )
+osm_switch_is_in_mcast_tree(IN const osm_switch_t * const p_sw,
+			    IN const uint16_t mlid_ho)
 {
-	const osm_mcast_tbl_t* p_tbl;
+	const osm_mcast_tbl_t *p_tbl;
 
 	p_tbl = &p_sw->mcast_tbl;
-	if( p_tbl )
-		return( osm_mcast_tbl_is_any_port( &p_sw->mcast_tbl, mlid_ho ) );
+	if (p_tbl)
+		return (osm_mcast_tbl_is_any_port(&p_sw->mcast_tbl, mlid_ho));
 	else
-		return( FALSE );
+		return (FALSE);
 }
+
 /*
 * PARAMETERS
 *	p_sw
@@ -1249,5 +1229,4 @@ osm_switch_is_in_mcast_tree(
 *********/
 
 END_C_DECLS
-
-#endif /* _OSM_SWITCH_H_ */
+#endif				/* _OSM_SWITCH_H_ */
diff --git a/opensm/include/opensm/osm_trap_rcv.h b/opensm/include/opensm/osm_trap_rcv.h
index e1077cf..393c5b1 100644
--- a/opensm/include/opensm/osm_trap_rcv.h
+++ b/opensm/include/opensm/osm_trap_rcv.h
@@ -62,13 +62,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/Trap Receiver
 * NAME
 *	Trap Receiver
@@ -86,7 +85,6 @@ BEGIN_C_DECLS
 *	Steve King, Intel
 *
 *********/
-
 /****s* OpenSM: Trap Receiver/osm_trap_rcv_t
 * NAME
 *	osm_trap_rcv_t
@@ -99,15 +97,14 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_trap_rcv
-{
-	osm_subn_t		*p_subn;
-	osm_stats_t		*p_stats;
-	osm_log_t	       	*p_log;
-	osm_resp_t		*p_resp;
-	osm_state_mgr_t		*p_state_mgr;
-	cl_plock_t		*p_lock;
-	cl_event_wheel_t	trap_aging_tracker;
+typedef struct _osm_trap_rcv {
+	osm_subn_t *p_subn;
+	osm_stats_t *p_stats;
+	osm_log_t *p_log;
+	osm_resp_t *p_resp;
+	osm_state_mgr_t *p_state_mgr;
+	cl_plock_t *p_lock;
+	cl_event_wheel_t trap_aging_tracker;
 } osm_trap_rcv_t;
 /*
 * FIELDS
@@ -147,8 +144,7 @@ typedef struct _osm_trap_rcv
 *
 * SYNOPSIS
 */
-void osm_trap_rcv_construct(
-	IN osm_trap_rcv_t* const p_rcv );
+void osm_trap_rcv_construct(IN osm_trap_rcv_t * const p_rcv);
 /*
 * PARAMETERS
 *	p_rcv
@@ -178,8 +174,7 @@ void osm_trap_rcv_construct(
 *
 * SYNOPSIS
 */
-void osm_trap_rcv_destroy(
-	IN osm_trap_rcv_t* const p_rcv );
+void osm_trap_rcv_destroy(IN osm_trap_rcv_t * const p_rcv);
 /*
 * PARAMETERS
 *	p_rcv
@@ -210,14 +205,13 @@ void osm_trap_rcv_destroy(
 *
 * SYNOPSIS
 */
-ib_api_status_t osm_trap_rcv_init(
-	IN osm_trap_rcv_t* const p_rcv,
-	IN osm_subn_t* const p_subn,
-	IN osm_stats_t* const p_stats,
-	IN osm_resp_t* const p_resp,
-	IN osm_log_t* const p_log,
-	IN osm_state_mgr_t* const p_state_mgr,
-	IN cl_plock_t* const p_lock );
+ib_api_status_t osm_trap_rcv_init(IN osm_trap_rcv_t * const p_rcv,
+				  IN osm_subn_t * const p_subn,
+				  IN osm_stats_t * const p_stats,
+				  IN osm_resp_t * const p_resp,
+				  IN osm_log_t * const p_log,
+				  IN osm_state_mgr_t * const p_state_mgr,
+				  IN cl_plock_t * const p_lock);
 /*
 * PARAMETERS
 *	p_rcv
@@ -262,9 +256,7 @@ ib_api_status_t osm_trap_rcv_init(
 *
 * SYNOPSIS
 */
-void osm_trap_rcv_process(
-	IN void *context,
-	IN void *data );
+void osm_trap_rcv_process(IN void *context, IN void *data);
 /*
 * PARAMETERS
 *	context
@@ -294,10 +286,8 @@ void osm_trap_rcv_process(
 * SYNOPSIS
 */
 uint64_t
-osm_trap_rcv_aging_tracker_callback(
-  IN uint64_t key,
-  IN uint32_t num_regs,
-  IN void*    context );
+osm_trap_rcv_aging_tracker_callback(IN uint64_t key,
+				    IN uint32_t num_regs, IN void *context);
 
 /*
 * PARAMETERS
@@ -322,5 +312,4 @@ osm_trap_rcv_aging_tracker_callback(
 *********/
 
 END_C_DECLS
-
-#endif	/* _OSM_TRAP_RCV_H_ */
+#endif				/* _OSM_TRAP_RCV_H_ */
diff --git a/opensm/include/opensm/osm_ts_useraccess.h b/opensm/include/opensm/osm_ts_useraccess.h
index 8bb03b8..d68c924 100644
--- a/opensm/include/opensm/osm_ts_useraccess.h
+++ b/opensm/include/opensm/osm_ts_useraccess.h
@@ -38,17 +38,15 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
-typedef struct ib_user_mad_filter      osm_ts_user_mad_filter;
-typedef struct ib_set_port_info_ioctl  osm_ts_set_port_info_ioctl;
-typedef struct ib_get_port_info_ioctl  osm_ts_get_port_info_ioctl;
-typedef struct ib_gid_entry_ioctl      osm_ts_gid_entry_ioctl;
+typedef struct ib_user_mad_filter osm_ts_user_mad_filter;
+typedef struct ib_set_port_info_ioctl osm_ts_set_port_info_ioctl;
+typedef struct ib_get_port_info_ioctl osm_ts_get_port_info_ioctl;
+typedef struct ib_gid_entry_ioctl osm_ts_gid_entry_ioctl;
 
 END_C_DECLS
-
diff --git a/opensm/include/opensm/osm_ucast_mgr.h b/opensm/include/opensm/osm_ucast_mgr.h
index 4824971..c3c26e4 100644
--- a/opensm/include/opensm/osm_ucast_mgr.h
+++ b/opensm/include/opensm/osm_ucast_mgr.h
@@ -59,15 +59,13 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 #define OSM_UCAST_MGR_LIST_SIZE_MIN 256
-
 /****h* OpenSM/Unicast Manager
 * NAME
 *	Unicast Manager
@@ -85,7 +83,6 @@ BEGIN_C_DECLS
 *	Steve King, Intel
 *
 *********/
-
 /****s* OpenSM: Unicast Manager/osm_ucast_mgr_t
 * NAME
 *	osm_ucast_mgr_t
@@ -98,15 +95,14 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_ucast_mgr
-{
-	osm_subn_t	*p_subn;
-	osm_req_t	*p_req;
-	osm_log_t	*p_log;
-	cl_plock_t	*p_lock;
-	boolean_t	 any_change;
-	boolean_t	some_hop_count_set;
-	uint8_t		*lft_buf;
+typedef struct _osm_ucast_mgr {
+	osm_subn_t *p_subn;
+	osm_req_t *p_req;
+	osm_log_t *p_log;
+	cl_plock_t *p_lock;
+	boolean_t any_change;
+	boolean_t some_hop_count_set;
+	uint8_t *lft_buf;
 } osm_ucast_mgr_t;
 /*
 * FIELDS
@@ -148,9 +144,7 @@ typedef struct _osm_ucast_mgr
 *
 * SYNOPSIS
 */
-void
-osm_ucast_mgr_construct(
-	IN osm_ucast_mgr_t* const p_mgr );
+void osm_ucast_mgr_construct(IN osm_ucast_mgr_t * const p_mgr);
 /*
 * PARAMETERS
 *	p_mgr
@@ -180,9 +174,7 @@ osm_ucast_mgr_construct(
 *
 * SYNOPSIS
 */
-void
-osm_ucast_mgr_destroy(
-	IN osm_ucast_mgr_t* const p_mgr );
+void osm_ucast_mgr_destroy(IN osm_ucast_mgr_t * const p_mgr);
 /*
 * PARAMETERS
 *	p_mgr
@@ -214,12 +206,10 @@ osm_ucast_mgr_destroy(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_ucast_mgr_init(
-	IN osm_ucast_mgr_t* const p_mgr,
-	IN osm_req_t* const p_req,
-	IN osm_subn_t* const p_subn,
-	IN osm_log_t* const p_log,
-	IN cl_plock_t* const p_lock );
+osm_ucast_mgr_init(IN osm_ucast_mgr_t * const p_mgr,
+		   IN osm_req_t * const p_req,
+		   IN osm_subn_t * const p_subn,
+		   IN osm_log_t * const p_log, IN cl_plock_t * const p_lock);
 /*
 * PARAMETERS
 *	p_mgr
@@ -259,9 +249,8 @@ osm_ucast_mgr_init(
 * SYNOPSIS
 */
 void
-osm_ucast_mgr_set_fwd_table(
-	IN osm_ucast_mgr_t* const p_mgr,
-	IN osm_switch_t* const p_sw );
+osm_ucast_mgr_set_fwd_table(IN osm_ucast_mgr_t * const p_mgr,
+			    IN osm_switch_t * const p_sw);
 /*
 * PARAMETERS
 *	p_mgr
@@ -283,9 +272,7 @@ osm_ucast_mgr_set_fwd_table(
 *
 * SYNOPSIS
 */
-void
-osm_ucast_mgr_build_lid_matrices(
-	IN osm_ucast_mgr_t* const p_mgr );
+void osm_ucast_mgr_build_lid_matrices(IN osm_ucast_mgr_t * const p_mgr);
 /*
 * PARAMETERS
 *	p_mgr
@@ -309,10 +296,9 @@ osm_ucast_mgr_build_lid_matrices(
 * SYNOPSIS
 */
 cl_status_t
-osm_ucast_mgr_read_guid_file(
-	IN  osm_ucast_mgr_t * const p_mgr,
-	IN  const char      * guid_file_name,
-	IN  cl_list_t       * p_list );
+osm_ucast_mgr_read_guid_file(IN osm_ucast_mgr_t * const p_mgr,
+			     IN const char *guid_file_name,
+			     IN cl_list_t * p_list);
 /*
 * PARAMETERS
 *	p_mgr
@@ -344,9 +330,7 @@ osm_ucast_mgr_read_guid_file(
 *
 * SYNOPSIS
 */
-osm_signal_t
-osm_ucast_mgr_process(
-	IN osm_ucast_mgr_t* const p_mgr );
+osm_signal_t osm_ucast_mgr_process(IN osm_ucast_mgr_t * const p_mgr);
 /*
 * PARAMETERS
 *	p_mgr
@@ -366,5 +350,4 @@ osm_ucast_mgr_process(
 *	Unicast Manager, Node Info Response Controller
 *********/
 END_C_DECLS
-
-#endif	/* _OSM_UCAST_MGR_H_ */
+#endif				/* _OSM_UCAST_MGR_H_ */
diff --git a/opensm/include/opensm/osm_umadt.h b/opensm/include/opensm/osm_umadt.h
index 9462554..809f478 100644
--- a/opensm/include/opensm/osm_umadt.h
+++ b/opensm/include/opensm/osm_umadt.h
@@ -57,24 +57,24 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
 
-typedef struct _umadt_obj_t{
-	void*           umadt_handle;
+typedef struct _umadt_obj_t {
+	void *umadt_handle;
 	UMADT_INTERFACE uMadtInterface;
-	IBT_INTERFACE   IbtInterface;
-	boolean     	init_done;
-	cl_spinlock_t 	register_lock;
-	cl_qlist_t  	register_list;
-	osm_log_t		*p_log;
-	uint32_t		timeout;
+	IBT_INTERFACE IbtInterface;
+	boolean init_done;
+	cl_spinlock_t register_lock;
+	cl_qlist_t register_list;
+	osm_log_t *p_log;
+	uint32_t timeout;
 
-}umadt_obj_t;
+} umadt_obj_t;
 /*********/
 
 /****s* OpenSM: Umadt MAD Wrapper/osm_bind_info
@@ -87,28 +87,28 @@ typedef struct _umadt_obj_t{
 * SYNOPSIS
 */
 
-typedef struct _mad_bind_info_t{
-    cl_list_item_t              list_item;
-	umadt_obj_t					*p_umadt_obj;
-    osm_mad_pool_t              *p_mad_pool;
-    osm_vend_mad_recv_callback_t    mad_recv_callback;
-    void                        *client_context;
-    cl_thread_t                 recv_processor_thread;
-	cl_spinlock_t				trans_ctxt_lock;
-	cl_qlist_t					trans_ctxt_list;
-	cl_timer_t					timeout_timer;
-	cl_spinlock_t				timeout_list_lock;
-	cl_qlist_t					timeout_list;
-    RegisterClassStruct         umadt_reg_class;
-    MADT_HANDLE                 umadt_handle;       /* Umadt type */
+typedef struct _mad_bind_info_t {
+	cl_list_item_t list_item;
+	umadt_obj_t *p_umadt_obj;
+	osm_mad_pool_t *p_mad_pool;
+	osm_vend_mad_recv_callback_t mad_recv_callback;
+	void *client_context;
+	cl_thread_t recv_processor_thread;
+	cl_spinlock_t trans_ctxt_lock;
+	cl_qlist_t trans_ctxt_list;
+	cl_timer_t timeout_timer;
+	cl_spinlock_t timeout_list_lock;
+	cl_qlist_t timeout_list;
+	RegisterClassStruct umadt_reg_class;
+	MADT_HANDLE umadt_handle;	/* Umadt type */
 
-}mad_bind_info_t;
+} mad_bind_info_t;
 
 typedef struct _trans_context_t {
-	cl_list_item_t	list_item;
-	uint64_t		trans_id;
-        uint64_t		sent_time;	/* micro secs */
-	void*			context;
+	cl_list_item_t list_item;
+	uint64_t trans_id;
+	uint64_t sent_time;	/* micro secs */
+	void *context;
 } trans_context_t;
 
 /*
@@ -139,5 +139,4 @@ typedef struct _trans_context_t {
 *********/
 
 END_C_DECLS
-
 #endif /*_OSM_UMADT_h_ */
diff --git a/opensm/include/opensm/osm_version.h b/opensm/include/opensm/osm_version.h
index 1887874..f847c39 100644
--- a/opensm/include/opensm/osm_version.h
+++ b/opensm/include/opensm/osm_version.h
@@ -39,13 +39,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****s* OpenSM: Base/OSM_VERSION
 * NAME
 *	OSM_VERSION
@@ -57,7 +56,5 @@ BEGIN_C_DECLS
 */
 #define OSM_VERSION "OpenSM Rev:openib-3.1.4"
 /********/
-
 END_C_DECLS
-
-#endif	/* _OSM_VERSION_H_ */
+#endif				/* _OSM_VERSION_H_ */
diff --git a/opensm/include/opensm/osm_vl15intf.h b/opensm/include/opensm/osm_vl15intf.h
index bf381df..6de9898 100644
--- a/opensm/include/opensm/osm_vl15intf.h
+++ b/opensm/include/opensm/osm_vl15intf.h
@@ -64,13 +64,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/VL15
 * NAME
 *	VL15
@@ -94,7 +93,6 @@ BEGIN_C_DECLS
 *	Steve King, Intel
 *
 *********/
-
 /****d* OpenSM: SM/osm_vl15_state_t
 * NAME
 *	osm_vl15_state_t
@@ -104,11 +102,9 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef enum _osm_vl15_state
-{
+typedef enum _osm_vl15_state {
 	OSM_VL15_STATE_INIT = 0,
 	OSM_VL15_STATE_READY
-
 } osm_vl15_state_t;
 /***********/
 
@@ -124,22 +120,21 @@ typedef enum _osm_vl15_state
 *
 * SYNOPSIS
 */
-typedef struct _osm_vl15
-{
-	osm_thread_state_t				thread_state;
-	osm_vl15_state_t				state;
-	uint32_t						max_wire_smps;
-	cl_event_t						signal;
-	cl_thread_t						poller;
-	cl_qlist_t						rfifo;
-	cl_qlist_t						ufifo;
-	cl_spinlock_t					lock;
-	osm_vendor_t					*p_vend;
-	osm_log_t						*p_log;
-	osm_stats_t						*p_stats;
-	osm_subn_t						*p_subn;
-	cl_disp_reg_handle_t			h_disp;
-	cl_plock_t						*p_lock;
+typedef struct _osm_vl15 {
+	osm_thread_state_t thread_state;
+	osm_vl15_state_t state;
+	uint32_t max_wire_smps;
+	cl_event_t signal;
+	cl_thread_t poller;
+	cl_qlist_t rfifo;
+	cl_qlist_t ufifo;
+	cl_spinlock_t lock;
+	osm_vendor_t *p_vend;
+	osm_log_t *p_log;
+	osm_stats_t *p_stats;
+	osm_subn_t *p_subn;
+	cl_disp_reg_handle_t h_disp;
+	cl_plock_t *p_lock;
 
 } osm_vl15_t;
 /*
@@ -201,9 +196,7 @@ typedef struct _osm_vl15
 *
 * SYNOPSIS
 */
-void
-osm_vl15_construct(
-	IN osm_vl15_t* const p_vl15 );
+void osm_vl15_construct(IN osm_vl15_t * const p_vl15);
 /*
 * PARAMETERS
 *	p_vl15
@@ -233,9 +226,7 @@ osm_vl15_construct(
 * SYNOPSIS
 */
 void
-osm_vl15_destroy(
-	IN osm_vl15_t* const p_vl15,
-   IN struct _osm_mad_pool *p_pool);
+osm_vl15_destroy(IN osm_vl15_t * const p_vl15, IN struct _osm_mad_pool *p_pool);
 /*
 * PARAMETERS
 *	p_vl15
@@ -272,15 +263,13 @@ osm_vl15_destroy(
 * SYNOPSIS
 */
 ib_api_status_t
-osm_vl15_init(
-	IN osm_vl15_t* const p_vl15,
-	IN osm_vendor_t* const p_vend,
-	IN osm_log_t* const p_log,
-	IN osm_stats_t* const p_stats,
-	IN const int32_t max_wire_smps,
-	IN osm_subn_t* const p_subn,
-	IN cl_dispatcher_t* const p_disp,
-	IN cl_plock_t* const p_lock );
+osm_vl15_init(IN osm_vl15_t * const p_vl15,
+	      IN osm_vendor_t * const p_vend,
+	      IN osm_log_t * const p_log,
+	      IN osm_stats_t * const p_stats,
+	      IN const int32_t max_wire_smps,
+	      IN osm_subn_t * const p_subn,
+	      IN cl_dispatcher_t * const p_disp, IN cl_plock_t * const p_lock);
 /*
 * PARAMETERS
 *	p_vl15
@@ -327,10 +316,7 @@ osm_vl15_init(
 *
 * SYNOPSIS
 */
-void
-osm_vl15_post(
-	IN osm_vl15_t* const p_vl15,
-	IN osm_madw_t* const p_madw );
+void osm_vl15_post(IN osm_vl15_t * const p_vl15, IN osm_madw_t * const p_madw);
 /*
 * PARAMETERS
 *	p_vl15
@@ -359,9 +345,7 @@ osm_vl15_post(
 *
 * SYNOPSIS
 */
-void
-osm_vl15_poll(
-	IN osm_vl15_t* const p_vl );
+void osm_vl15_poll(IN osm_vl15_t * const p_vl);
 /*
 * PARAMETERS
 *	p_vl15
@@ -392,9 +376,8 @@ osm_vl15_poll(
 * SYNOPSIS
 */
 void
-osm_vl15_shutdown(
-	IN osm_vl15_t* const p_vl,
-	IN osm_mad_pool_t* const p_mad_pool);
+osm_vl15_shutdown(IN osm_vl15_t * const p_vl,
+		  IN osm_mad_pool_t * const p_mad_pool);
 /*
 * PARAMETERS
 *	p_vl15
@@ -413,5 +396,4 @@ osm_vl15_shutdown(
 *********/
 
 END_C_DECLS
-
-#endif		/* _OSM_VL15INTF_H_ */
+#endif				/* _OSM_VL15INTF_H_ */
diff --git a/opensm/include/opensm/osm_vl_arb_rcv.h b/opensm/include/opensm/osm_vl_arb_rcv.h
index 1ba9ea6..2ca91f6 100644
--- a/opensm/include/opensm/osm_vl_arb_rcv.h
+++ b/opensm/include/opensm/osm_vl_arb_rcv.h
@@ -59,13 +59,12 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 /****h* OpenSM/VL Arbitration Receiver
 * NAME
 *	VL Arbitration Receiver
@@ -83,7 +82,6 @@ BEGIN_C_DECLS
 *	Eitan Zahavi, Mellanox
 *
 *********/
-
 /****s* OpenSM: VL Arbitration Receiver/osm_vla_rcv_t
 * NAME
 *	osm_vla_rcv_t
@@ -96,12 +94,11 @@ BEGIN_C_DECLS
 *
 * SYNOPSIS
 */
-typedef struct _osm_vla_rcv
-{
-	osm_subn_t	*p_subn;
-	osm_req_t	*p_req;
-	osm_log_t	*p_log;
-	cl_plock_t	*p_lock;
+typedef struct _osm_vla_rcv {
+	osm_subn_t *p_subn;
+	osm_req_t *p_req;
+	osm_log_t *p_log;
+	cl_plock_t *p_lock;
 } osm_vla_rcv_t;
 /*
 * FIELDS
@@ -130,8 +127,7 @@ typedef struct _osm_vla_rcv
 *
 * SYNOPSIS
 */
-void osm_vla_rcv_construct(
-	IN osm_vla_rcv_t* const p_ctrl );
+void osm_vla_rcv_construct(IN osm_vla_rcv_t * const p_ctrl);
 /*
 * PARAMETERS
 *	p_ctrl
@@ -161,8 +157,7 @@ void osm_vla_rcv_construct(
 *
 * SYNOPSIS
 */
-void osm_vla_rcv_destroy(
-	IN osm_vla_rcv_t* const p_ctrl );
+void osm_vla_rcv_destroy(IN osm_vla_rcv_t * const p_ctrl);
 /*
 * PARAMETERS
 *	p_ctrl
@@ -193,12 +188,11 @@ void osm_vla_rcv_destroy(
 *
 * SYNOPSIS
 */
-ib_api_status_t osm_vla_rcv_init(
-	IN osm_vla_rcv_t* const p_ctrl,
-	IN osm_req_t* const p_req,
-	IN osm_subn_t* const p_subn,
-	IN osm_log_t* const p_log,
-	IN cl_plock_t* const p_lock );
+ib_api_status_t osm_vla_rcv_init(IN osm_vla_rcv_t * const p_ctrl,
+				 IN osm_req_t * const p_req,
+				 IN osm_subn_t * const p_subn,
+				 IN osm_log_t * const p_log,
+				 IN cl_plock_t * const p_lock);
 /*
 * PARAMETERS
 *	p_ctrl
@@ -237,9 +231,7 @@ ib_api_status_t osm_vla_rcv_init(
 *
 * SYNOPSIS
 */
-void osm_vla_rcv_process(
-	IN void *context,
-	IN void *data );
+void osm_vla_rcv_process(IN void *context, IN void *data);
 /*
 * PARAMETERS
 *	context
@@ -260,5 +252,4 @@ void osm_vla_rcv_process(
 *********/
 
 END_C_DECLS
-
-#endif	/* _OSM_VLA_RCV_H_ */
+#endif				/* _OSM_VLA_RCV_H_ */
diff --git a/opensm/include/opensm/st.h b/opensm/include/opensm/st.h
index f627e7d..f32d3bb 100644
--- a/opensm/include/opensm/st.h
+++ b/opensm/include/opensm/st.h
@@ -43,19 +43,17 @@
 #ifdef __cplusplus
 #  define BEGIN_C_DECLS extern "C" {
 #  define END_C_DECLS   }
-#else /* !__cplusplus */
+#else				/* !__cplusplus */
 #  define BEGIN_C_DECLS
 #  define END_C_DECLS
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 BEGIN_C_DECLS
-
 #if (__WORDSIZE == 64) || defined (_WIN64)
 #define st_ptr_t unsigned long long
 #else
 #define st_ptr_t unsigned long
 #endif
-
 typedef st_ptr_t st_data_t;
 
 #define ST_DATA_T_DEFINED
@@ -63,20 +61,20 @@ typedef st_ptr_t st_data_t;
 typedef struct st_table st_table;
 
 struct st_hash_type {
-  int (*compare)(void *, void *);
-  st_ptr_t (*hash)(void *);
+	int (*compare) (void *, void *);
+	st_ptr_t(*hash) (void *);
 };
 
 struct st_table {
-    struct st_hash_type *type;
-    int num_bins;
-    int num_entries;
-    struct st_table_entry **bins;
+	struct st_hash_type *type;
+	int num_bins;
+	int num_entries;
+	struct st_table_entry **bins;
 };
 
 #define st_is_member(table,key) st_lookup(table,key,(st_data_t *)0)
 
-enum st_retval {ST_CONTINUE, ST_STOP, ST_DELETE};
+enum st_retval { ST_CONTINUE, ST_STOP, ST_DELETE };
 
 st_table *st_init_table(struct st_hash_type *);
 st_table *st_init_table_with_size(struct st_hash_type *, size_t);
@@ -88,7 +86,9 @@ int st_delete(st_table *, st_data_t *, st_data_t *);
 int st_delete_safe(st_table *, st_data_t *, st_data_t *, st_data_t);
 int st_insert(st_table *, st_data_t, st_data_t);
 int st_lookup(st_table *, st_data_t, st_data_t *);
-void st_foreach(st_table *, int (*)(st_data_t key, st_data_t val, st_data_t arg), st_data_t);
+void st_foreach(st_table *,
+		int (*)(st_data_t key, st_data_t val, st_data_t arg),
+		st_data_t);
 void st_add_direct(st_table *, st_data_t, st_data_t);
 void st_free_table(st_table *);
 void st_cleanup_safe(st_table *, st_data_t);
@@ -103,5 +103,4 @@ st_table *st_copy(st_table *);
 /* int st_strhash(void); */
 
 END_C_DECLS
-
-#endif /* ST_INCLUDED */
+#endif				/* ST_INCLUDED */
-- 
1.5.3.rc2.29.gc4640f




More information about the general mailing list