[ofa-general] [PATCH] opensm: rename 'struct _osm_*_t' to 'struct osm_*'
Sasha Khapyorsky
sashak at voltaire.com
Sun Jun 15 12:09:05 PDT 2008
This renames OpenSM structures from 'struct _osm_*_t' to 'struct osm_*'
form removing meaningless leading underscore character and '_t' prefix.
Signed-off-by: Sasha Khapyorsky <sashak at voltaire.com>
---
opensm/include/opensm/osm_attrib_req.h | 2 +-
opensm/include/opensm/osm_console_io.h | 2 +-
opensm/include/opensm/osm_db.h | 6 ++--
opensm/include/opensm/osm_db_pack.h | 2 +-
opensm/include/opensm/osm_fwd_tbl.h | 2 +-
opensm/include/opensm/osm_inform.h | 2 +-
opensm/include/opensm/osm_lid_mgr.h | 2 +-
opensm/include/opensm/osm_lin_fwd_tbl.h | 2 +-
opensm/include/opensm/osm_log.h | 2 +-
opensm/include/opensm/osm_mad_pool.h | 2 +-
opensm/include/opensm/osm_madw.h | 30 ++++++++--------
opensm/include/opensm/osm_mcast_tbl.h | 2 +-
opensm/include/opensm/osm_mcm_info.h | 2 +-
opensm/include/opensm/osm_mcm_port.h | 2 +-
opensm/include/opensm/osm_mtree.h | 6 ++--
opensm/include/opensm/osm_multicast.h | 2 +-
opensm/include/opensm/osm_node.h | 6 ++--
opensm/include/opensm/osm_opensm.h | 2 +-
opensm/include/opensm/osm_partition.h | 2 +-
opensm/include/opensm/osm_path.h | 2 +-
opensm/include/opensm/osm_perfmgr.h | 2 +-
opensm/include/opensm/osm_pkey.h | 34 +++++++++---------
opensm/include/opensm/osm_port.h | 22 ++++++------
opensm/include/opensm/osm_port_profile.h | 2 +-
opensm/include/opensm/osm_qos_policy.h | 14 ++++----
opensm/include/opensm/osm_rand_fwd_tbl.h | 2 +-
opensm/include/opensm/osm_remote_sm.h | 2 +-
opensm/include/opensm/osm_router.h | 2 +-
opensm/include/opensm/osm_sa.h | 8 ++--
opensm/include/opensm/osm_sa_mad_ctrl.h | 8 ++--
opensm/include/opensm/osm_service.h | 2 +-
opensm/include/opensm/osm_sm_mad_ctrl.h | 2 +-
opensm/include/opensm/osm_stats.h | 2 +-
opensm/include/opensm/osm_subnet.h | 48 +++++++++++++-------------
opensm/include/opensm/osm_sweep_fail_ctrl.h | 2 +-
opensm/include/opensm/osm_switch.h | 2 +-
opensm/include/opensm/osm_ucast_mgr.h | 2 +-
opensm/include/opensm/osm_vl15intf.h | 4 +-
opensm/opensm/osm_db_files.c | 4 +-
opensm/opensm/osm_inform.c | 2 +-
opensm/opensm/osm_lid_mgr.c | 2 +-
opensm/opensm/osm_mcast_mgr.c | 2 +-
opensm/opensm/osm_port.c | 6 ++--
opensm/opensm/osm_sa_guidinfo_record.c | 4 +-
opensm/opensm/osm_sa_informinfo.c | 4 +-
opensm/opensm/osm_sa_lft_record.c | 4 +-
opensm/opensm/osm_sa_link_record.c | 2 +-
opensm/opensm/osm_sa_mcmember_record.c | 2 +-
opensm/opensm/osm_sa_mft_record.c | 4 +-
opensm/opensm/osm_sa_multipath_record.c | 4 +-
opensm/opensm/osm_sa_node_record.c | 4 +-
opensm/opensm/osm_sa_path_record.c | 4 +-
opensm/opensm/osm_sa_pkey_record.c | 4 +-
opensm/opensm/osm_sa_portinfo_record.c | 4 +-
opensm/opensm/osm_sa_service_record.c | 4 +-
opensm/opensm/osm_sa_slvl_record.c | 4 +-
opensm/opensm/osm_sa_sminfo_record.c | 4 +-
opensm/opensm/osm_sa_sw_info_record.c | 4 +-
opensm/opensm/osm_sa_vlarb_record.c | 4 +-
opensm/opensm/osm_trap_rcv.c | 2 +-
opensm/opensm/osm_vl15intf.c | 2 +-
61 files changed, 160 insertions(+), 160 deletions(-)
diff --git a/opensm/include/opensm/osm_attrib_req.h b/opensm/include/opensm/osm_attrib_req.h
index 8a702bc..e79073b 100644
--- a/opensm/include/opensm/osm_attrib_req.h
+++ b/opensm/include/opensm/osm_attrib_req.h
@@ -80,7 +80,7 @@ BEGIN_C_DECLS
*
* SYNOPSIS
*/
-typedef struct _osm_attrib_req {
+typedef struct osm_attrib_req {
uint16_t attrib_id;
uint32_t attrib_mod;
osm_madw_context_t context;
diff --git a/opensm/include/opensm/osm_console_io.h b/opensm/include/opensm/osm_console_io.h
index f8f10a5..cf9019f 100644
--- a/opensm/include/opensm/osm_console_io.h
+++ b/opensm/include/opensm/osm_console_io.h
@@ -64,7 +64,7 @@
#endif /* __cplusplus */
BEGIN_C_DECLS
-typedef struct _osm_console_t {
+typedef struct osm_console {
int socket;
int in_fd;
int out_fd;
diff --git a/opensm/include/opensm/osm_db.h b/opensm/include/opensm/osm_db.h
index a35bae8..e937df9 100644
--- a/opensm/include/opensm/osm_db.h
+++ b/opensm/include/opensm/osm_db.h
@@ -88,8 +88,8 @@ BEGIN_C_DECLS
*
* SYNOPSIS
*/
-typedef struct _osm_db_domain {
- struct _osm_db *p_db;
+typedef struct osm_db_domain {
+ struct osm_db *p_db;
void *p_domain_imp;
} osm_db_domain_t;
/*
@@ -116,7 +116,7 @@ typedef struct _osm_db_domain {
*
* SYNOPSIS
*/
-typedef struct _osm_db {
+typedef struct osm_db {
void *p_db_imp;
osm_log_t *p_log;
cl_list_t domains;
diff --git a/opensm/include/opensm/osm_db_pack.h b/opensm/include/opensm/osm_db_pack.h
index 45838da..83861a6 100644
--- a/opensm/include/opensm/osm_db_pack.h
+++ b/opensm/include/opensm/osm_db_pack.h
@@ -100,7 +100,7 @@ static inline osm_db_domain_t *osm_db_guid2lid_init(IN osm_db_t * const p_db)
*
* SYNOPSIS
*/
-typedef struct _osm_db_guid_elem {
+typedef struct osm_db_guid_elem {
cl_list_item_t item;
uint64_t guid;
} osm_db_guid_elem_t;
diff --git a/opensm/include/opensm/osm_fwd_tbl.h b/opensm/include/opensm/osm_fwd_tbl.h
index 35e469a..55e853f 100644
--- a/opensm/include/opensm/osm_fwd_tbl.h
+++ b/opensm/include/opensm/osm_fwd_tbl.h
@@ -88,7 +88,7 @@ BEGIN_C_DECLS
*
* SYNOPSIS
*/
-typedef struct _osm_fwd_tbl_t {
+typedef struct osm_fwd_tbl {
osm_rand_fwd_tbl_t *p_rnd_tbl;
osm_lin_fwd_tbl_t *p_lin_tbl;
} osm_fwd_tbl_t;
diff --git a/opensm/include/opensm/osm_inform.h b/opensm/include/opensm/osm_inform.h
index 67d1c61..e2325da 100644
--- a/opensm/include/opensm/osm_inform.h
+++ b/opensm/include/opensm/osm_inform.h
@@ -94,7 +94,7 @@ BEGIN_C_DECLS
*
* SYNOPSIS
*/
-typedef struct _osm_infr_t {
+typedef struct osm_infr {
cl_list_item_t list_item;
osm_bind_handle_t h_bind;
osm_sa_t *sa;
diff --git a/opensm/include/opensm/osm_lid_mgr.h b/opensm/include/opensm/osm_lid_mgr.h
index 7d6b84c..556eb48 100644
--- a/opensm/include/opensm/osm_lid_mgr.h
+++ b/opensm/include/opensm/osm_lid_mgr.h
@@ -90,7 +90,7 @@ struct osm_sm;
*
* SYNOPSIS
*/
-typedef struct _osm_lid_mgr {
+typedef struct osm_lid_mgr {
struct osm_sm *sm;
osm_subn_t *p_subn;
osm_db_t *p_db;
diff --git a/opensm/include/opensm/osm_lin_fwd_tbl.h b/opensm/include/opensm/osm_lin_fwd_tbl.h
index 6c64c09..98c6b4f 100644
--- a/opensm/include/opensm/osm_lin_fwd_tbl.h
+++ b/opensm/include/opensm/osm_lin_fwd_tbl.h
@@ -84,7 +84,7 @@ BEGIN_C_DECLS
*
* SYNOPSIS
*/
-typedef struct _osm_lin_fwd_tbl {
+typedef struct osm_lin_fwdbl {
uint16_t size;
uint8_t port_tbl[1];
} osm_lin_fwd_tbl_t;
diff --git a/opensm/include/opensm/osm_log.h b/opensm/include/opensm/osm_log.h
index f90aa9b..c6409be 100644
--- a/opensm/include/opensm/osm_log.h
+++ b/opensm/include/opensm/osm_log.h
@@ -110,7 +110,7 @@ typedef uint8_t osm_log_level_t;
*
* SYNOPSIS
*/
-typedef struct _osm_log {
+typedef struct osm_log {
osm_log_level_t level;
cl_spinlock_t lock;
unsigned long count;
diff --git a/opensm/include/opensm/osm_mad_pool.h b/opensm/include/opensm/osm_mad_pool.h
index 3f5df01..9810a8f 100644
--- a/opensm/include/opensm/osm_mad_pool.h
+++ b/opensm/include/opensm/osm_mad_pool.h
@@ -88,7 +88,7 @@ BEGIN_C_DECLS
*
* SYNOPSIS
*/
-typedef struct _osm_mad_pool {
+typedef struct osm_mad_pool {
atomic32_t mads_out;
} osm_mad_pool_t;
/*
diff --git a/opensm/include/opensm/osm_madw.h b/opensm/include/opensm/osm_madw.h
index 955b500..70649a3 100644
--- a/opensm/include/opensm/osm_madw.h
+++ b/opensm/include/opensm/osm_madw.h
@@ -67,7 +67,7 @@ BEGIN_C_DECLS
*
* SYNOPSIS
*/
-typedef struct _osm_bind_info {
+typedef struct osm_bind_info {
ib_net64_t port_guid;
uint8_t mad_class;
uint8_t class_version;
@@ -135,7 +135,7 @@ typedef struct _osm_bind_info {
*
* SYNOPSIS
*/
-typedef struct _osm_ni_context {
+typedef struct osm_ni_context {
ib_net64_t node_guid;
uint8_t port_num;
ib_net64_t dup_node_guid;
@@ -167,7 +167,7 @@ typedef struct _osm_ni_context {
*
* SYNOPSIS
*/
-typedef struct _osm_pi_context {
+typedef struct osm_pi_context {
ib_net64_t node_guid;
ib_net64_t port_guid;
boolean_t set_method;
@@ -186,7 +186,7 @@ typedef struct _osm_pi_context {
*
* SYNOPSIS
*/
-typedef struct _osm_nd_context {
+typedef struct osm_nd_context {
ib_net64_t node_guid;
} osm_nd_context_t;
/*********/
@@ -200,7 +200,7 @@ typedef struct _osm_nd_context {
*
* SYNOPSIS
*/
-typedef struct _osm_si_context {
+typedef struct osm_si_context {
ib_net64_t node_guid;
boolean_t set_method;
boolean_t light_sweep;
@@ -216,7 +216,7 @@ typedef struct _osm_si_context {
*
* SYNOPSIS
*/
-typedef struct _osm_lft_context {
+typedef struct osm_lft_context {
ib_net64_t node_guid;
boolean_t set_method;
} osm_lft_context_t;
@@ -231,7 +231,7 @@ typedef struct _osm_lft_context {
*
* SYNOPSIS
*/
-typedef struct _osm_mft_context {
+typedef struct osm_mft_context {
ib_net64_t node_guid;
boolean_t set_method;
} osm_mft_context_t;
@@ -246,7 +246,7 @@ typedef struct _osm_mft_context {
*
* SYNOPSIS
*/
-typedef struct _osm_smi_context {
+typedef struct osm_smi_context {
ib_net64_t port_guid;
boolean_t set_method;
} osm_smi_context_t;
@@ -261,7 +261,7 @@ typedef struct _osm_smi_context {
*
* SYNOPSIS
*/
-typedef struct _osm_pkey_context {
+typedef struct osm_pkey_context {
ib_net64_t node_guid;
ib_net64_t port_guid;
boolean_t set_method;
@@ -277,7 +277,7 @@ typedef struct _osm_pkey_context {
*
* SYNOPSIS
*/
-typedef struct _osm_slvl_context {
+typedef struct osm_slvl_context {
ib_net64_t node_guid;
ib_net64_t port_guid;
boolean_t set_method;
@@ -293,7 +293,7 @@ typedef struct _osm_slvl_context {
*
* SYNOPSIS
*/
-typedef struct _osm_vla_context {
+typedef struct osm_vla_context {
ib_net64_t node_guid;
ib_net64_t port_guid;
boolean_t set_method;
@@ -304,7 +304,7 @@ typedef struct _osm_vla_context {
* DESCRIPTION
* Context for Performance manager queries
*/
-typedef struct _osm_perfmgr_context {
+typedef struct osm_perfmgr_context {
uint64_t node_guid;
uint16_t port;
uint8_t mad_method; /* was this a get or a set */
@@ -324,7 +324,7 @@ typedef struct _osm_perfmgr_context {
*
* SYNOPSIS
*/
-typedef struct _osm_arbitrary_context {
+typedef struct osm_arbitrary_context {
void *context1;
void *context2;
} osm_arbitrary_context_t;
@@ -366,7 +366,7 @@ typedef union _osm_madw_context {
*
* SYNOPSIS
*/
-typedef struct _osm_mad_addr {
+typedef struct osm_mad_addr {
ib_net16_t dest_lid;
uint8_t path_bits;
uint8_t static_rate;
@@ -401,7 +401,7 @@ typedef struct _osm_mad_addr {
*
* SYNOPSIS
*/
-typedef struct _osm_madw {
+typedef struct osm_madw {
cl_list_item_t list_item;
osm_bind_handle_t h_bind;
osm_vend_wrap_t vend_wrap;
diff --git a/opensm/include/opensm/osm_mcast_tbl.h b/opensm/include/opensm/osm_mcast_tbl.h
index 3aa5aa9..15b95cf 100644
--- a/opensm/include/opensm/osm_mcast_tbl.h
+++ b/opensm/include/opensm/osm_mcast_tbl.h
@@ -67,7 +67,7 @@ BEGIN_C_DECLS
*
* SYNOPSIS
*/
-typedef struct _osm_mcast_fwd_tbl {
+typedef struct osm_mcast_fwdbl {
uint8_t num_ports;
uint8_t max_position;
uint16_t max_block;
diff --git a/opensm/include/opensm/osm_mcm_info.h b/opensm/include/opensm/osm_mcm_info.h
index b40771c..dec607f 100644
--- a/opensm/include/opensm/osm_mcm_info.h
+++ b/opensm/include/opensm/osm_mcm_info.h
@@ -71,7 +71,7 @@ BEGIN_C_DECLS
*
* SYNOPSIS
*/
-typedef struct _osm_mcm_info {
+typedef struct osm_mcm_info {
cl_list_item_t list_item;
ib_net16_t mlid;
} osm_mcm_info_t;
diff --git a/opensm/include/opensm/osm_mcm_port.h b/opensm/include/opensm/osm_mcm_port.h
index e8c560e..c2b18de 100644
--- a/opensm/include/opensm/osm_mcm_port.h
+++ b/opensm/include/opensm/osm_mcm_port.h
@@ -69,7 +69,7 @@ BEGIN_C_DECLS
*
* SYNOPSIS
*/
-typedef struct _osm_mcm_port {
+typedef struct osm_mcm_port {
cl_map_item_t map_item;
ib_gid_t port_gid;
uint8_t scope_state;
diff --git a/opensm/include/opensm/osm_mtree.h b/opensm/include/opensm/osm_mtree.h
index e9d663c..7297442 100644
--- a/opensm/include/opensm/osm_mtree.h
+++ b/opensm/include/opensm/osm_mtree.h
@@ -97,12 +97,12 @@ BEGIN_C_DECLS
*
* SYNOPSIS
*/
-typedef struct _osm_mtree_node {
+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];
+ struct osm_mtree_node *p_up;
+ struct osm_mtree_node *child_array[1];
} osm_mtree_node_t;
/*
* FIELDS
diff --git a/opensm/include/opensm/osm_multicast.h b/opensm/include/opensm/osm_multicast.h
index 57e5ef5..c109c91 100644
--- a/opensm/include/opensm/osm_multicast.h
+++ b/opensm/include/opensm/osm_multicast.h
@@ -151,7 +151,7 @@ typedef struct osm_mcast_mgr_ctxt {
*
* SYNOPSIS
*/
-typedef struct _osm_mgrp {
+typedef struct osm_mgrp {
cl_map_item_t map_item;
ib_net16_t mlid;
osm_mtree_node_t *p_root;
diff --git a/opensm/include/opensm/osm_node.h b/opensm/include/opensm/osm_node.h
index a679f65..0c06ee8 100644
--- a/opensm/include/opensm/osm_node.h
+++ b/opensm/include/opensm/osm_node.h
@@ -60,7 +60,7 @@
BEGIN_C_DECLS
-struct _osm_switch;
+struct osm_switch;
/****h* OpenSM/Node
* NAME
@@ -94,9 +94,9 @@ struct _osm_switch;
*
* SYNOPSIS
*/
-typedef struct _osm_node {
+typedef struct osm_node {
cl_map_item_t map_item;
- struct _osm_switch *sw;
+ struct osm_switch *sw;
ib_node_info_t node_info;
ib_node_desc_t node_desc;
uint32_t discovery_count;
diff --git a/opensm/include/opensm/osm_opensm.h b/opensm/include/opensm/osm_opensm.h
index 92e4238..fd94b03 100644
--- a/opensm/include/opensm/osm_opensm.h
+++ b/opensm/include/opensm/osm_opensm.h
@@ -161,7 +161,7 @@ struct osm_routing_engine {
*
* SYNOPSIS
*/
-typedef struct _osm_opensm_t {
+typedef struct osm_opensm {
osm_subn_t subn;
osm_sm_t sm;
osm_sa_t sa;
diff --git a/opensm/include/opensm/osm_partition.h b/opensm/include/opensm/osm_partition.h
index 6ddb8ae..38acdc9 100644
--- a/opensm/include/opensm/osm_partition.h
+++ b/opensm/include/opensm/osm_partition.h
@@ -89,7 +89,7 @@ BEGIN_C_DECLS
*
* SYNOPSIS
*/
-typedef struct _osm_prtn {
+typedef struct osm_prtn {
cl_map_item_t map_item;
ib_net16_t pkey;
ib_net16_t mlid;
diff --git a/opensm/include/opensm/osm_path.h b/opensm/include/opensm/osm_path.h
index 7b36d68..0b765cb 100644
--- a/opensm/include/opensm/osm_path.h
+++ b/opensm/include/opensm/osm_path.h
@@ -78,7 +78,7 @@ BEGIN_C_DECLS
*
* SYNOPSIS
*/
-typedef struct _osm_dr_path {
+typedef struct osm_dr_path {
osm_bind_handle_t h_bind;
uint8_t hop_count;
uint8_t path[IB_SUBNET_PATH_HOPS_MAX];
diff --git a/opensm/include/opensm/osm_perfmgr.h b/opensm/include/opensm/osm_perfmgr.h
index 9152f5f..e2eafd7 100644
--- a/opensm/include/opensm/osm_perfmgr.h
+++ b/opensm/include/opensm/osm_perfmgr.h
@@ -109,7 +109,7 @@ typedef struct _monitored_node {
* This object should be treated as opaque and should
* be manipulated only through the provided functions.
*/
-typedef struct _osm_perfmgr {
+typedef struct osm_perfmgr {
cl_event_t sig_sweep;
cl_timer_t sweep_timer;
osm_subn_t *subn;
diff --git a/opensm/include/opensm/osm_pkey.h b/opensm/include/opensm/osm_pkey.h
index 54bfcd9..c10a55e 100644
--- a/opensm/include/opensm/osm_pkey.h
+++ b/opensm/include/opensm/osm_pkey.h
@@ -55,11 +55,11 @@ BEGIN_C_DECLS
/*
Forward references.
*/
-struct _osm_physp;
-struct _osm_port;
-struct _osm_subn;
-struct _osm_node;
-struct _osm_physp;
+struct osm_physp;
+struct osm_port;
+struct osm_subn;
+struct osm_node;
+struct osm_physp;
/*
* Abstract:
@@ -80,7 +80,7 @@ struct _osm_physp;
*
* SYNOPSIS
*/
-typedef struct _osm_pkey_tbl {
+typedef struct osm_pkeybl {
cl_ptr_vector_t blocks;
cl_ptr_vector_t new_blocks;
cl_map_t keys;
@@ -132,7 +132,7 @@ typedef struct _osm_pkey_tbl {
*
* SYNOPSIS
*/
-typedef struct _osm_pending_pkey {
+typedef struct osm_pending_pkey {
cl_list_item_t list_item;
uint16_t pkey;
uint16_t block;
@@ -439,8 +439,8 @@ osm_pkey_tbl_set(IN osm_pkey_tbl_t * p_pkey_tbl,
*
* SYNOPSIS
*/
-boolean_t osm_physp_share_this_pkey(IN const struct _osm_physp *const p_physp1,
- IN const struct _osm_physp *const p_physp2,
+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
@@ -471,9 +471,9 @@ boolean_t osm_physp_share_this_pkey(IN const struct _osm_physp *const p_physp1,
*
* SYNOPSIS
*/
-ib_net16_t osm_physp_find_common_pkey(IN const struct _osm_physp *const
+ib_net16_t osm_physp_find_common_pkey(IN const struct osm_physp *const
p_physp1,
- IN const struct _osm_physp *const
+ IN const struct osm_physp *const
p_physp2);
/*
* PARAMETERS
@@ -517,8 +517,8 @@ ib_net16_t osm_physp_find_common_pkey(IN const struct _osm_physp *const
* 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);
+ IN const struct osm_physp *const p_physp_1,
+ IN const struct osm_physp *const p_physp_2);
/*
* PARAMETERS
@@ -564,8 +564,8 @@ boolean_t osm_physp_share_pkey(IN osm_log_t * p_log,
* 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);
+ IN const struct osm_port *const p_port_1,
+ IN const struct osm_port *const p_port_2);
/*
* PARAMETERS
@@ -611,7 +611,7 @@ boolean_t osm_port_share_pkey(IN osm_log_t * p_log,
* SYNOPSIS
*/
boolean_t osm_lid_share_pkey(IN osm_log_t * p_log,
- IN const struct _osm_subn *const p_subn,
+ 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,
@@ -671,7 +671,7 @@ boolean_t osm_lid_share_pkey(IN osm_log_t * p_log,
*/
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);
+ IN const struct osm_physp *const p_physp);
/*
* PARAMETERS
diff --git a/opensm/include/opensm/osm_port.h b/opensm/include/opensm/osm_port.h
index c1cbd39..514f6e7 100644
--- a/opensm/include/opensm/osm_port.h
+++ b/opensm/include/opensm/osm_port.h
@@ -65,8 +65,8 @@ BEGIN_C_DECLS
/*
Forward references.
*/
-struct _osm_port;
-struct _osm_node;
+struct osm_port;
+struct osm_node;
/****h* OpenSM/Physical Port
* NAME
@@ -103,12 +103,12 @@ struct _osm_node;
*
* SYNOPSIS
*/
-typedef struct _osm_physp {
+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;
+ struct osm_node *p_node;
+ struct osm_physp *p_remote_physp;
boolean_t healthy;
uint8_t vl_high_limit;
unsigned need_update;
@@ -209,7 +209,7 @@ 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 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);
@@ -963,12 +963,12 @@ osm_physp_get_port_num(IN const osm_physp_t * const p_physp)
*
* SYNOPSIS
*/
-static inline struct _osm_node *osm_physp_get_node_ptr(IN const osm_physp_t *
+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);
+ return ((struct osm_node *)p_physp->p_node);
}
/*
@@ -1141,9 +1141,9 @@ static inline osm_dr_path_t *osm_physp_get_dr_path_ptr(IN const osm_physp_t *
*
* SYNOPSIS
*/
-typedef struct _osm_port {
+typedef struct osm_port {
cl_map_item_t map_item;
- struct _osm_node *p_node;
+ struct osm_node *p_node;
ib_net64_t guid;
uint32_t discovery_count;
unsigned is_new;
@@ -1214,7 +1214,7 @@ void osm_port_delete(IN OUT osm_port_t ** const pp_port);
* SYNOPSIS
*/
osm_port_t *osm_port_new(IN const ib_node_info_t * p_ni,
- IN struct _osm_node *const p_parent_node);
+ IN struct osm_node *const p_parent_node);
/*
* PARAMETERS
* p_ni
diff --git a/opensm/include/opensm/osm_port_profile.h b/opensm/include/opensm/osm_port_profile.h
index 9997d0b..9c80c03 100644
--- a/opensm/include/opensm/osm_port_profile.h
+++ b/opensm/include/opensm/osm_port_profile.h
@@ -89,7 +89,7 @@ BEGIN_C_DECLS
*
* SYNOPSIS
*/
-typedef struct _osm_port_profile {
+typedef struct osm_port_profile {
uint32_t num_paths;
} osm_port_profile_t;
/*
diff --git a/opensm/include/opensm/osm_qos_policy.h b/opensm/include/opensm/osm_qos_policy.h
index d57a40a..1924d9d 100644
--- a/opensm/include/opensm/osm_qos_policy.h
+++ b/opensm/include/opensm/osm_qos_policy.h
@@ -66,12 +66,12 @@
/***************************************************/
-typedef struct _osm_qos_port_t {
+typedef struct osm_qos_port {
cl_map_item_t map_item;
osm_physp_t * p_physp;
} osm_qos_port_t;
-typedef struct _osm_qos_port_group_t {
+typedef struct osm_qos_port_group {
char *name; /* single string (this port group name) */
char *use; /* single string (description) */
uint8_t node_types; /* node types bitmask */
@@ -80,7 +80,7 @@ typedef struct _osm_qos_port_group_t {
/***************************************************/
-typedef struct _osm_qos_vlarb_scope_t {
+typedef struct osm_qos_vlarb_scope {
cl_list_t group_list; /* list of group names (strings) */
cl_list_t across_list; /* list of 'across' group names (strings) */
cl_list_t vlarb_high_list; /* list of num pairs (n:m,...), 32-bit values */
@@ -91,7 +91,7 @@ typedef struct _osm_qos_vlarb_scope_t {
/***************************************************/
-typedef struct _osm_qos_sl2vl_scope_t {
+typedef struct osm_qos_sl2vl_scope {
cl_list_t group_list; /* list of strings (port group names) */
boolean_t from[OSM_QOS_POLICY_MAX_PORTS_ON_SWITCH];
boolean_t to[OSM_QOS_POLICY_MAX_PORTS_ON_SWITCH];
@@ -103,7 +103,7 @@ typedef struct _osm_qos_sl2vl_scope_t {
/***************************************************/
-typedef struct _osm_qos_level_t {
+typedef struct osm_qos_level {
char *use;
char *name;
uint8_t sl;
@@ -123,7 +123,7 @@ typedef struct _osm_qos_level_t {
/***************************************************/
-typedef struct _osm_qos_match_rule_t {
+typedef struct osm_qos_match_rule {
char *use;
cl_list_t source_list; /* list of strings */
cl_list_t source_group_list; /* list of pointers to relevant port-group */
@@ -141,7 +141,7 @@ typedef struct _osm_qos_match_rule_t {
/***************************************************/
-typedef struct _osm_qos_policy_t {
+typedef struct osm_qos_policy {
cl_list_t port_groups; /* list of osm_qos_port_group_t */
cl_list_t sl2vl_tables; /* list of osm_qos_sl2vl_scope_t */
cl_list_t vlarb_tables; /* list of osm_qos_vlarb_scope_t */
diff --git a/opensm/include/opensm/osm_rand_fwd_tbl.h b/opensm/include/opensm/osm_rand_fwd_tbl.h
index c7c4586..8e9ac90 100644
--- a/opensm/include/opensm/osm_rand_fwd_tbl.h
+++ b/opensm/include/opensm/osm_rand_fwd_tbl.h
@@ -87,7 +87,7 @@ BEGIN_C_DECLS
*
* SYNOPSIS
*/
-typedef struct _osm_rand_fwd_tbl {
+typedef struct osm_rand_fwdbl {
/* PLACE HOLDER STRUCTURE ONLY!! */
uint32_t size;
} osm_rand_fwd_tbl_t;
diff --git a/opensm/include/opensm/osm_remote_sm.h b/opensm/include/opensm/osm_remote_sm.h
index 1bdc6cb..4cc980b 100644
--- a/opensm/include/opensm/osm_remote_sm.h
+++ b/opensm/include/opensm/osm_remote_sm.h
@@ -85,7 +85,7 @@ BEGIN_C_DECLS
*
* SYNOPSIS
*/
-typedef struct _osm_remote_sm {
+typedef struct osm_remote_sm {
cl_map_item_t map_item;
const osm_port_t *p_port;
ib_sm_info_t smi;
diff --git a/opensm/include/opensm/osm_router.h b/opensm/include/opensm/osm_router.h
index 7ba6b3d..8cabdf8 100644
--- a/opensm/include/opensm/osm_router.h
+++ b/opensm/include/opensm/osm_router.h
@@ -92,7 +92,7 @@ BEGIN_C_DECLS
*
* SYNOPSIS
*/
-typedef struct _osm_router {
+typedef struct osm_router {
cl_map_item_t map_item;
osm_port_t *p_port;
} osm_router_t;
diff --git a/opensm/include/opensm/osm_sa.h b/opensm/include/opensm/osm_sa.h
index a797a9d..72d4d86 100644
--- a/opensm/include/opensm/osm_sa.h
+++ b/opensm/include/opensm/osm_sa.h
@@ -113,7 +113,7 @@ typedef enum _osm_sa_state {
*
* SYNOPSIS
*/
-typedef struct _osm_sa {
+typedef struct osm_sa {
osm_sa_state_t state;
osm_sm_t *sm;
osm_subn_t *p_subn;
@@ -418,7 +418,7 @@ void osm_sa_respond(osm_sa_t *sa, osm_madw_t *madw, size_t attr_size,
* SA object
*********/
-struct _osm_opensm_t;
+struct osm_opensm;
/****f* OpenSM: SA/osm_sa_db_file_dump
* NAME
* osm_sa_db_file_dump
@@ -428,7 +428,7 @@ struct _osm_opensm_t;
*
* SYNOPSIS
*/
-int osm_sa_db_file_dump(struct _osm_opensm_t *p_osm);
+int osm_sa_db_file_dump(struct osm_opensm *p_osm);
/*
* PARAMETERS
* p_osm
@@ -448,7 +448,7 @@ int osm_sa_db_file_dump(struct _osm_opensm_t *p_osm);
*
* SYNOPSIS
*/
-int osm_sa_db_file_load(struct _osm_opensm_t *p_osm);
+int osm_sa_db_file_load(struct osm_opensm *p_osm);
/*
* PARAMETERS
* p_osm
diff --git a/opensm/include/opensm/osm_sa_mad_ctrl.h b/opensm/include/opensm/osm_sa_mad_ctrl.h
index 1fde803..581ea12 100644
--- a/opensm/include/opensm/osm_sa_mad_ctrl.h
+++ b/opensm/include/opensm/osm_sa_mad_ctrl.h
@@ -78,7 +78,7 @@ BEGIN_C_DECLS
*
*********/
-struct _osm_sa;
+struct osm_sa;
/****s* OpenSM: SA MAD Controller/osm_sa_mad_ctrl_t
* NAME
* osm_sa_mad_ctrl_t
@@ -91,8 +91,8 @@ struct _osm_sa;
*
* SYNOPSIS
*/
-typedef struct _osm_sa_mad_ctrl {
- struct _osm_sa *sa;
+typedef struct osm_sa_mad_ctrl {
+ struct osm_sa *sa;
osm_log_t *p_log;
osm_mad_pool_t *p_mad_pool;
osm_vendor_t *p_vendor;
@@ -205,7 +205,7 @@ void osm_sa_mad_ctrl_destroy(IN osm_sa_mad_ctrl_t * const p_ctrl);
* SYNOPSIS
*/
ib_api_status_t osm_sa_mad_ctrl_init(IN osm_sa_mad_ctrl_t * const p_ctrl,
- IN struct _osm_sa * sa,
+ IN struct osm_sa * sa,
IN osm_mad_pool_t * const p_mad_pool,
IN osm_vendor_t * const p_vendor,
IN osm_subn_t * const p_subn,
diff --git a/opensm/include/opensm/osm_service.h b/opensm/include/opensm/osm_service.h
index d1dc506..1d97a68 100644
--- a/opensm/include/opensm/osm_service.h
+++ b/opensm/include/opensm/osm_service.h
@@ -88,7 +88,7 @@ BEGIN_C_DECLS
*
* SYNOPSIS
*/
-typedef struct _osm_svcr_t {
+typedef struct osm_svcr {
cl_list_item_t list_item;
ib_service_record_t service_record;
uint32_t modified_time;
diff --git a/opensm/include/opensm/osm_sm_mad_ctrl.h b/opensm/include/opensm/osm_sm_mad_ctrl.h
index f003ed8..1c41168 100644
--- a/opensm/include/opensm/osm_sm_mad_ctrl.h
+++ b/opensm/include/opensm/osm_sm_mad_ctrl.h
@@ -92,7 +92,7 @@ BEGIN_C_DECLS
*
* SYNOPSIS
*/
-typedef struct _osm_sm_mad_ctrl {
+typedef struct osm_sm_mad_ctrl {
osm_log_t *p_log;
osm_subn_t *p_subn;
osm_mad_pool_t *p_mad_pool;
diff --git a/opensm/include/opensm/osm_stats.h b/opensm/include/opensm/osm_stats.h
index ad50d5a..575e9e4 100644
--- a/opensm/include/opensm/osm_stats.h
+++ b/opensm/include/opensm/osm_stats.h
@@ -81,7 +81,7 @@ BEGIN_C_DECLS
*
* SYNOPSIS
*/
-typedef struct _osm_stats {
+typedef struct osm_stats {
atomic32_t qp0_mads_outstanding;
atomic32_t qp0_mads_outstanding_on_wire;
atomic32_t qp0_mads_rcvd;
diff --git a/opensm/include/opensm/osm_subnet.h b/opensm/include/opensm/osm_subnet.h
index 338b274..1b97508 100644
--- a/opensm/include/opensm/osm_subnet.h
+++ b/opensm/include/opensm/osm_subnet.h
@@ -63,8 +63,8 @@ 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;
-struct _osm_qos_policy_t;
+struct osm_opensm;
+struct osm_qos_policy;
/****h* OpenSM/Subnet
* NAME
@@ -161,7 +161,7 @@ typedef void
*
* SYNOPSIS
*/
-typedef struct _osm_qos_options_t {
+typedef struct osm_qos_options {
unsigned max_vls;
unsigned high_limit;
char *vlarb_high;
@@ -199,7 +199,7 @@ typedef struct _osm_qos_options_t {
*
* SYNOPSIS
*/
-typedef struct _osm_subn_opt {
+typedef struct osm_subn_opt {
char *config_file;
ib_net64_t guid;
ib_net64_t m_key;
@@ -521,8 +521,8 @@ typedef struct _osm_subn_opt {
*
* SYNOPSIS
*/
-typedef struct _osm_subn {
- struct _osm_opensm_t *p_osm;
+typedef struct osm_subn {
+ struct osm_opensm *p_osm;
cl_qmap_t sw_guid_tbl;
cl_qmap_t node_guid_tbl;
cl_qmap_t port_guid_tbl;
@@ -540,7 +540,7 @@ typedef struct _osm_subn {
ib_net64_t sm_port_guid;
uint8_t sm_state;
osm_subn_opt_t opt;
- struct _osm_qos_policy_t *p_qos_policy;
+ struct osm_qos_policy *p_qos_policy;
uint16_t max_unicast_lid_ho;
uint16_t max_multicast_lid_ho;
uint8_t min_ca_mtu;
@@ -749,7 +749,7 @@ void osm_subn_destroy(IN osm_subn_t * const p_subn);
*/
ib_api_status_t
osm_subn_init(IN osm_subn_t * const p_subn,
- IN struct _osm_opensm_t *const p_osm,
+ IN struct osm_opensm *const p_osm,
IN const osm_subn_opt_t * const p_opt);
/*
* PARAMETERS
@@ -772,11 +772,11 @@ osm_subn_init(IN osm_subn_t * const p_subn,
/*
Forward references.
*/
-struct _osm_mad_addr;
-struct _osm_log;
-struct _osm_switch;
-struct _osm_physp;
-struct _osm_port;
+struct osm_mad_addr;
+struct osm_log;
+struct osm_switch;
+struct osm_physp;
+struct osm_port;
/****f* OpenSM: Helper/osm_get_gid_by_mad_addr
* NAME
@@ -791,9 +791,9 @@ struct _osm_port;
* SYNOPSIS
*/
ib_api_status_t
-osm_get_gid_by_mad_addr(IN struct _osm_log *p_log,
+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,
+ IN const struct osm_mad_addr *p_mad_addr,
OUT ib_gid_t * p_gid);
/*
* PARAMETERS
@@ -829,9 +829,9 @@ osm_get_gid_by_mad_addr(IN struct _osm_log *p_log,
*
* SYNOPSIS
*/
-struct _osm_physp *osm_get_physp_by_mad_addr(IN struct _osm_log *p_log,
+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
+ IN struct osm_mad_addr
*p_mad_addr);
/*
* PARAMETERS
@@ -864,9 +864,9 @@ struct _osm_physp *osm_get_physp_by_mad_addr(IN struct _osm_log *p_log,
*
* SYNOPSIS
*/
-struct _osm_port *osm_get_port_by_mad_addr(IN struct _osm_log *p_log,
+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);
+ IN struct osm_mad_addr *p_mad_addr);
/*
* PARAMETERS
* p_log
@@ -897,7 +897,7 @@ struct _osm_port *osm_get_port_by_mad_addr(IN struct _osm_log *p_log,
*
* SYNOPSIS
*/
-struct _osm_switch *osm_get_switch_by_guid(IN const osm_subn_t * p_subn,
+struct osm_switch *osm_get_switch_by_guid(IN const osm_subn_t * p_subn,
IN uint64_t guid);
/*
* PARAMETERS
@@ -926,7 +926,7 @@ struct _osm_switch *osm_get_switch_by_guid(IN const osm_subn_t * p_subn,
*
* SYNOPSIS
*/
-struct _osm_node *osm_get_node_by_guid(IN osm_subn_t const *p_subn,
+struct osm_node *osm_get_node_by_guid(IN osm_subn_t const *p_subn,
IN uint64_t guid);
/*
* PARAMETERS
@@ -955,7 +955,7 @@ struct _osm_node *osm_get_node_by_guid(IN osm_subn_t const *p_subn,
*
* SYNOPSIS
*/
-struct _osm_port *osm_get_port_by_guid(IN osm_subn_t const *p_subn,
+struct osm_port *osm_get_port_by_guid(IN osm_subn_t const *p_subn,
IN ib_net64_t guid);
/*
* PARAMETERS
@@ -985,9 +985,9 @@ struct _osm_port *osm_get_port_by_guid(IN osm_subn_t const *p_subn,
*
* SYNOPSIS
*/
-struct _osm_physp *osm_get_physp_by_mad_addr(IN struct _osm_log *p_log,
+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
+ IN struct osm_mad_addr
*p_mad_addr);
/*
* PARAMETERS
diff --git a/opensm/include/opensm/osm_sweep_fail_ctrl.h b/opensm/include/opensm/osm_sweep_fail_ctrl.h
index fccc5fa..12832c0 100644
--- a/opensm/include/opensm/osm_sweep_fail_ctrl.h
+++ b/opensm/include/opensm/osm_sweep_fail_ctrl.h
@@ -89,7 +89,7 @@ struct osm_sm;
*
* SYNOPSIS
*/
-typedef struct _osm_sweep_fail_ctrl {
+typedef struct osm_sweep_fail_ctrl {
struct osm_sm *sm;
cl_disp_reg_handle_t h_disp;
} osm_sweep_fail_ctrl_t;
diff --git a/opensm/include/opensm/osm_switch.h b/opensm/include/opensm/osm_switch.h
index c1521a6..90119b9 100644
--- a/opensm/include/opensm/osm_switch.h
+++ b/opensm/include/opensm/osm_switch.h
@@ -92,7 +92,7 @@ BEGIN_C_DECLS
*
* SYNOPSIS
*/
-typedef struct _osm_switch {
+typedef struct osm_switch {
cl_map_item_t map_item;
osm_node_t *p_node;
ib_switch_info_t switch_info;
diff --git a/opensm/include/opensm/osm_ucast_mgr.h b/opensm/include/opensm/osm_ucast_mgr.h
index 478078d..9be059c 100644
--- a/opensm/include/opensm/osm_ucast_mgr.h
+++ b/opensm/include/opensm/osm_ucast_mgr.h
@@ -90,7 +90,7 @@ struct osm_sm;
*
* SYNOPSIS
*/
-typedef struct _osm_ucast_mgr {
+typedef struct osm_ucast_mgr {
struct osm_sm *sm;
osm_subn_t *p_subn;
osm_log_t *p_log;
diff --git a/opensm/include/opensm/osm_vl15intf.h b/opensm/include/opensm/osm_vl15intf.h
index 7453de8..b2a225f 100644
--- a/opensm/include/opensm/osm_vl15intf.h
+++ b/opensm/include/opensm/osm_vl15intf.h
@@ -113,7 +113,7 @@ typedef enum _osm_vl15_state {
*
* SYNOPSIS
*/
-typedef struct _osm_vl15 {
+typedef struct osm_vl15 {
osm_thread_state_t thread_state;
osm_vl15_state_t state;
uint32_t max_wire_smps;
@@ -206,7 +206,7 @@ void osm_vl15_construct(IN osm_vl15_t * const p_vl15);
* 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
diff --git a/opensm/opensm/osm_db_files.c b/opensm/opensm/osm_db_files.c
index 1d1aaab..3e25dab 100644
--- a/opensm/opensm/osm_db_files.c
+++ b/opensm/opensm/osm_db_files.c
@@ -83,7 +83,7 @@
*
* SYNOPSIS
*/
-typedef struct _osm_db_domain_imp {
+typedef struct osm_db_domain_imp {
char *file_name;
st_table *p_hash;
cl_spinlock_t lock;
@@ -104,7 +104,7 @@ typedef struct _osm_db_domain_imp {
*
* SYNOPSIS
*/
-typedef struct _osm_db_imp {
+typedef struct osm_db_imp {
char *db_dir_name;
} osm_db_imp_t;
/*
diff --git a/opensm/opensm/osm_inform.c b/opensm/opensm/osm_inform.c
index 7782f02..1a4f18f 100644
--- a/opensm/opensm/osm_inform.c
+++ b/opensm/opensm/osm_inform.c
@@ -51,7 +51,7 @@
#include <opensm/osm_pkey.h>
#include <opensm/osm_sa.h>
-typedef struct _osm_infr_match_ctxt {
+typedef struct osm_infr_match_ctxt {
cl_list_t *p_remove_infr_list;
ib_mad_notice_attr_t *p_ntc;
} osm_infr_match_ctxt_t;
diff --git a/opensm/opensm/osm_lid_mgr.c b/opensm/opensm/osm_lid_mgr.c
index 1ad9ef0..e3ebf11 100644
--- a/opensm/opensm/osm_lid_mgr.c
+++ b/opensm/opensm/osm_lid_mgr.c
@@ -98,7 +98,7 @@
/**********************************************************************
lid range item of qlist
**********************************************************************/
-typedef struct _osm_lid_mgr_range {
+typedef struct osm_lid_mgr_range {
cl_list_item_t item;
uint16_t min_lid;
uint16_t max_lid;
diff --git a/opensm/opensm/osm_mcast_mgr.c b/opensm/opensm/osm_mcast_mgr.c
index 75afbbb..5d554b3 100644
--- a/opensm/opensm/osm_mcast_mgr.c
+++ b/opensm/opensm/osm_mcast_mgr.c
@@ -57,7 +57,7 @@
/**********************************************************************
**********************************************************************/
-typedef struct _osm_mcast_work_obj {
+typedef struct osm_mcast_work_obj {
cl_list_item_t list_item;
osm_port_t *p_port;
} osm_mcast_work_obj_t;
diff --git a/opensm/opensm/osm_port.c b/opensm/opensm/osm_port.c
index 18f1ef2..b213e89 100644
--- a/opensm/opensm/osm_port.c
+++ b/opensm/opensm/osm_port.c
@@ -92,7 +92,7 @@ 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 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)
@@ -107,7 +107,7 @@ osm_physp_init(IN osm_physp_t * const p_physp,
p_physp->port_num = port_num;
p_physp->healthy = TRUE;
p_physp->need_update = 2;
- p_physp->p_node = (struct _osm_node *)p_node;
+ p_physp->p_node = (struct osm_node *)p_node;
osm_dr_path_init(&p_physp->dr_path, h_bind, hop_count, p_initial_path);
@@ -159,7 +159,7 @@ osm_port_init(IN osm_port_t * const p_port,
memset(p_port, 0, sizeof(*p_port));
cl_qlist_init(&p_port->mcm_list);
- p_port->p_node = (struct _osm_node *)p_parent_node;
+ p_port->p_node = (struct osm_node *)p_parent_node;
port_guid = p_ni->port_guid;
p_port->guid = port_guid;
port_num = p_ni->node_type == IB_NODE_TYPE_SWITCH ?
diff --git a/opensm/opensm/osm_sa_guidinfo_record.c b/opensm/opensm/osm_sa_guidinfo_record.c
index f38c575..7760f42 100644
--- a/opensm/opensm/osm_sa_guidinfo_record.c
+++ b/opensm/opensm/osm_sa_guidinfo_record.c
@@ -57,12 +57,12 @@
#include <opensm/osm_pkey.h>
#include <opensm/osm_sa.h>
-typedef struct _osm_gir_item {
+typedef struct osm_gir_item {
cl_list_item_t list_item;
ib_guidinfo_record_t rec;
} osm_gir_item_t;
-typedef struct _osm_gir_search_ctxt {
+typedef struct osm_gir_search_ctxt {
const ib_guidinfo_record_t *p_rcvd_rec;
ib_net64_t comp_mask;
cl_qlist_t *p_list;
diff --git a/opensm/opensm/osm_sa_informinfo.c b/opensm/opensm/osm_sa_informinfo.c
index 2e0c504..798f5db 100644
--- a/opensm/opensm/osm_sa_informinfo.c
+++ b/opensm/opensm/osm_sa_informinfo.c
@@ -59,12 +59,12 @@
#include <opensm/osm_inform.h>
#include <opensm/osm_pkey.h>
-typedef struct _osm_iir_item {
+typedef struct osm_iir_item {
cl_list_item_t list_item;
ib_inform_info_record_t rec;
} osm_iir_item_t;
-typedef struct _osm_iir_search_ctxt {
+typedef struct osm_iir_search_ctxt {
const ib_inform_info_record_t *p_rcvd_rec;
ib_net64_t comp_mask;
cl_qlist_t *p_list;
diff --git a/opensm/opensm/osm_sa_lft_record.c b/opensm/opensm/osm_sa_lft_record.c
index 1699824..f4b9b6e 100644
--- a/opensm/opensm/osm_sa_lft_record.c
+++ b/opensm/opensm/osm_sa_lft_record.c
@@ -54,12 +54,12 @@
#include <opensm/osm_pkey.h>
#include <opensm/osm_sa.h>
-typedef struct _osm_lftr_item {
+typedef struct osm_lftr_item {
cl_list_item_t list_item;
ib_lft_record_t rec;
} osm_lftr_item_t;
-typedef struct _osm_lftr_search_ctxt {
+typedef struct osm_lftr_search_ctxt {
const ib_lft_record_t *p_rcvd_rec;
ib_net64_t comp_mask;
cl_qlist_t *p_list;
diff --git a/opensm/opensm/osm_sa_link_record.c b/opensm/opensm/osm_sa_link_record.c
index 6cc1836..0b761ba 100644
--- a/opensm/opensm/osm_sa_link_record.c
+++ b/opensm/opensm/osm_sa_link_record.c
@@ -55,7 +55,7 @@
#include <opensm/osm_pkey.h>
#include <opensm/osm_sa.h>
-typedef struct _osm_lr_item {
+typedef struct osm_lr_item {
cl_list_item_t list_item;
ib_link_record_t link_rec;
} osm_lr_item_t;
diff --git a/opensm/opensm/osm_sa_mcmember_record.c b/opensm/opensm/osm_sa_mcmember_record.c
index 1a9bc54..5db2a4d 100644
--- a/opensm/opensm/osm_sa_mcmember_record.c
+++ b/opensm/opensm/osm_sa_mcmember_record.c
@@ -75,7 +75,7 @@
IB_MCR_COMPMASK_FLOW | \
IB_MCR_COMPMASK_SL)
-typedef struct _osm_mcmr_item {
+typedef struct osm_mcmr_item {
cl_list_item_t list_item;
ib_member_rec_t rec;
} osm_mcmr_item_t;
diff --git a/opensm/opensm/osm_sa_mft_record.c b/opensm/opensm/osm_sa_mft_record.c
index 24b4c3b..57350a6 100644
--- a/opensm/opensm/osm_sa_mft_record.c
+++ b/opensm/opensm/osm_sa_mft_record.c
@@ -54,12 +54,12 @@
#include <opensm/osm_pkey.h>
#include <opensm/osm_sa.h>
-typedef struct _osm_mftr_item {
+typedef struct osm_mftr_item {
cl_list_item_t list_item;
ib_mft_record_t rec;
} osm_mftr_item_t;
-typedef struct _osm_mftr_search_ctxt {
+typedef struct osm_mftr_search_ctxt {
const ib_mft_record_t *p_rcvd_rec;
ib_net64_t comp_mask;
cl_qlist_t *p_list;
diff --git a/opensm/opensm/osm_sa_multipath_record.c b/opensm/opensm/osm_sa_multipath_record.c
index f8da64d..bad1962 100644
--- a/opensm/opensm/osm_sa_multipath_record.c
+++ b/opensm/opensm/osm_sa_multipath_record.c
@@ -63,7 +63,7 @@
#define OSM_SA_MPR_MAX_NUM_PATH 127
-typedef struct _osm_mpr_item {
+typedef struct osm_mpr_item {
cl_list_item_t list_item;
ib_path_rec_t path_rec;
const osm_port_t *p_src_port;
@@ -71,7 +71,7 @@ typedef struct _osm_mpr_item {
int hops;
} osm_mpr_item_t;
-typedef struct _osm_path_parms {
+typedef struct osm_path_parms {
ib_net16_t pkey;
uint8_t mtu;
uint8_t rate;
diff --git a/opensm/opensm/osm_sa_node_record.c b/opensm/opensm/osm_sa_node_record.c
index a43bba7..91b748b 100644
--- a/opensm/opensm/osm_sa_node_record.c
+++ b/opensm/opensm/osm_sa_node_record.c
@@ -54,12 +54,12 @@
#include <opensm/osm_pkey.h>
#include <opensm/osm_sa.h>
-typedef struct _osm_nr_item {
+typedef struct osm_nr_item {
cl_list_item_t list_item;
ib_node_record_t rec;
} osm_nr_item_t;
-typedef struct _osm_nr_search_ctxt {
+typedef struct osm_nr_search_ctxt {
const ib_node_record_t *p_rcvd_rec;
ib_net64_t comp_mask;
cl_qlist_t *p_list;
diff --git a/opensm/opensm/osm_sa_path_record.c b/opensm/opensm/osm_sa_path_record.c
index c468ba2..2a9155c 100644
--- a/opensm/opensm/osm_sa_path_record.c
+++ b/opensm/opensm/osm_sa_path_record.c
@@ -69,12 +69,12 @@ extern uint8_t osm_get_lash_sl(osm_opensm_t * p_osm,
const osm_port_t * p_src_port,
const osm_port_t * p_dst_port);
-typedef struct _osm_pr_item {
+typedef struct osm_pr_item {
cl_list_item_t list_item;
ib_path_rec_t path_rec;
} osm_pr_item_t;
-typedef struct _osm_path_parms {
+typedef struct osm_path_parms {
ib_net16_t pkey;
uint8_t mtu;
uint8_t rate;
diff --git a/opensm/opensm/osm_sa_pkey_record.c b/opensm/opensm/osm_sa_pkey_record.c
index 4d19ed4..d953369 100644
--- a/opensm/opensm/osm_sa_pkey_record.c
+++ b/opensm/opensm/osm_sa_pkey_record.c
@@ -50,12 +50,12 @@
#include <opensm/osm_pkey.h>
#include <opensm/osm_sa.h>
-typedef struct _osm_pkey_item {
+typedef struct osm_pkey_item {
cl_list_item_t list_item;
ib_pkey_table_record_t rec;
} osm_pkey_item_t;
-typedef struct _osm_pkey_search_ctxt {
+typedef struct osm_pkey_search_ctxt {
const ib_pkey_table_record_t *p_rcvd_rec;
ib_net64_t comp_mask;
uint16_t block_num;
diff --git a/opensm/opensm/osm_sa_portinfo_record.c b/opensm/opensm/osm_sa_portinfo_record.c
index 88d8c23..3f3163d 100644
--- a/opensm/opensm/osm_sa_portinfo_record.c
+++ b/opensm/opensm/osm_sa_portinfo_record.c
@@ -58,12 +58,12 @@
#include <opensm/osm_pkey.h>
#include <opensm/osm_sa.h>
-typedef struct _osm_pir_item {
+typedef struct osm_pir_item {
cl_list_item_t list_item;
ib_portinfo_record_t rec;
} osm_pir_item_t;
-typedef struct _osm_pir_search_ctxt {
+typedef struct osm_pir_search_ctxt {
const ib_portinfo_record_t *p_rcvd_rec;
ib_net64_t comp_mask;
cl_qlist_t *p_list;
diff --git a/opensm/opensm/osm_sa_service_record.c b/opensm/opensm/osm_sa_service_record.c
index d68ad22..c9f4ee0 100644
--- a/opensm/opensm/osm_sa_service_record.c
+++ b/opensm/opensm/osm_sa_service_record.c
@@ -59,7 +59,7 @@
#include <opensm/osm_service.h>
#include <opensm/osm_pkey.h>
-typedef struct _osm_sr_item {
+typedef struct osm_sr_item {
cl_list_item_t list_item;
ib_service_record_t service_rec;
} osm_sr_item_t;
@@ -71,7 +71,7 @@ typedef struct osm_sr_match_item {
osm_sa_t *sa;
} osm_sr_match_item_t;
-typedef struct _osm_sr_search_ctxt {
+typedef struct osm_sr_search_ctxt {
osm_sr_match_item_t *p_sr_item;
const osm_physp_t *p_req_physp;
} osm_sr_search_ctxt_t;
diff --git a/opensm/opensm/osm_sa_slvl_record.c b/opensm/opensm/osm_sa_slvl_record.c
index 0248594..f3b53dc 100644
--- a/opensm/opensm/osm_sa_slvl_record.c
+++ b/opensm/opensm/osm_sa_slvl_record.c
@@ -57,12 +57,12 @@
#include <opensm/osm_pkey.h>
#include <opensm/osm_sa.h>
-typedef struct _osm_slvl_item {
+typedef struct osm_slvl_item {
cl_list_item_t list_item;
ib_slvl_table_record_t rec;
} osm_slvl_item_t;
-typedef struct _osm_slvl_search_ctxt {
+typedef struct osm_slvl_search_ctxt {
const ib_slvl_table_record_t *p_rcvd_rec;
ib_net64_t comp_mask;
uint8_t in_port_num;
diff --git a/opensm/opensm/osm_sa_sminfo_record.c b/opensm/opensm/osm_sa_sminfo_record.c
index 1860e55..6eddc59 100644
--- a/opensm/opensm/osm_sa_sminfo_record.c
+++ b/opensm/opensm/osm_sa_sminfo_record.c
@@ -63,12 +63,12 @@
#include <opensm/osm_sa.h>
#include <opensm/osm_opensm.h>
-typedef struct _osm_smir_item {
+typedef struct osm_smir_item {
cl_list_item_t list_item;
ib_sminfo_record_t rec;
} osm_smir_item_t;
-typedef struct _osm_smir_search_ctxt {
+typedef struct osm_smir_search_ctxt {
const ib_sminfo_record_t *p_rcvd_rec;
ib_net64_t comp_mask;
cl_qlist_t *p_list;
diff --git a/opensm/opensm/osm_sa_sw_info_record.c b/opensm/opensm/osm_sa_sw_info_record.c
index 9003a6c..a05c814 100644
--- a/opensm/opensm/osm_sa_sw_info_record.c
+++ b/opensm/opensm/osm_sa_sw_info_record.c
@@ -54,12 +54,12 @@
#include <opensm/osm_pkey.h>
#include <opensm/osm_sa.h>
-typedef struct _osm_sir_item {
+typedef struct osm_sir_item {
cl_list_item_t list_item;
ib_switch_info_record_t rec;
} osm_sir_item_t;
-typedef struct _osm_sir_search_ctxt {
+typedef struct osm_sir_search_ctxt {
const ib_switch_info_record_t *p_rcvd_rec;
ib_net64_t comp_mask;
cl_qlist_t *p_list;
diff --git a/opensm/opensm/osm_sa_vlarb_record.c b/opensm/opensm/osm_sa_vlarb_record.c
index 6308a70..6b97a2e 100644
--- a/opensm/opensm/osm_sa_vlarb_record.c
+++ b/opensm/opensm/osm_sa_vlarb_record.c
@@ -57,12 +57,12 @@
#include <opensm/osm_pkey.h>
#include <opensm/osm_sa.h>
-typedef struct _osm_vl_arb_item {
+typedef struct osm_vl_arb_item {
cl_list_item_t list_item;
ib_vl_arb_table_record_t rec;
} osm_vl_arb_item_t;
-typedef struct _osm_vl_arb_search_ctxt {
+typedef struct osm_vl_arb_search_ctxt {
const ib_vl_arb_table_record_t *p_rcvd_rec;
ib_net64_t comp_mask;
uint8_t block_num;
diff --git a/opensm/opensm/osm_trap_rcv.c b/opensm/opensm/osm_trap_rcv.c
index 8210e7f..1ff8e6e 100644
--- a/opensm/opensm/osm_trap_rcv.c
+++ b/opensm/opensm/osm_trap_rcv.c
@@ -80,7 +80,7 @@ extern void osm_req_get_node_desc(IN osm_sm_t * sm, osm_physp_t *p_physp);
*
**********************************************************************/
-typedef struct _osm_trap_aging_tracker_context {
+typedef struct osm_trap_agingracker_context {
osm_log_t *p_log;
osm_physp_t *p_physp;
} osm_trap_aging_tracker_context_t;
diff --git a/opensm/opensm/osm_vl15intf.c b/opensm/opensm/osm_vl15intf.c
index 246e6cc..a47f9ba 100644
--- a/opensm/opensm/osm_vl15intf.c
+++ b/opensm/opensm/osm_vl15intf.c
@@ -200,7 +200,7 @@ void osm_vl15_construct(IN osm_vl15_t * const p_vl)
/**********************************************************************
**********************************************************************/
void
-osm_vl15_destroy(IN osm_vl15_t * const p_vl, IN struct _osm_mad_pool *p_pool)
+osm_vl15_destroy(IN osm_vl15_t * const p_vl, IN struct osm_mad_pool *p_pool)
{
osm_madw_t *p_madw;
--
1.5.5.1.178.g1f811
More information about the general
mailing list