OpenSM: Rename ib_inform_info_get_node_type to
ib_inform_info_get_prod_type
13.4.8.3 InformInfo does not have a node type but rather a producer type
(This is for master only)
Signed-off-by: Ira K. Weiny <[EMAIL PROTECTED]>
Signed-off-by: Hal Rosenstock <[EMAIL PROTECTED]>
diff --git a/diags/src/saquery.c b/diags/src/saquery.c
index af26d13..93f47d6 100644
--- a/diags/src/saquery.c
+++ b/diags/src/saquery.c
@@ -516,7 +516,7 @@ print_inform_info_record(ib_inform_info_
cl_ntoh16( p_iir->inform_info.g_or_v.generic.trap_num ),
cl_ntoh32( qpn ),
resp_time_val,
- cl_ntoh32(ib_inform_info_get_node_type(
&p_iir->inform_info ))
+ cl_ntoh32(ib_inform_info_get_prod_type(
&p_iir->inform_info ))
);
} else {
printf("InformInfoRecord dump:\n"
@@ -549,7 +549,7 @@ print_inform_info_record(ib_inform_info_
cl_ntoh16( p_iir->inform_info.g_or_v.vend.dev_id ),
cl_ntoh32( qpn ),
resp_time_val,
- cl_ntoh32(ib_inform_info_get_node_type(
&p_iir->inform_info ))
+ cl_ntoh32(ib_inform_info_get_prod_type(
&p_iir->inform_info ))
);
}
}
diff --git a/osm/include/iba/ib_types.h b/osm/include/iba/ib_types.h
index 7245e84..b3937cb 100644
--- a/osm/include/iba/ib_types.h
+++ b/osm/include/iba/ib_types.h
@@ -7266,17 +7266,18 @@ ib_inform_info_set_qpn(
* ib_inform_info_t
*********/
-/****f* IBA Base: Types/ib_inform_info_get_node_type
+/****f* IBA Base: Types/ib_inform_info_get_prod_type
* NAME
-* ib_inform_info_get_node_type
+* ib_inform_info_get_prod_type
*
* DESCRIPTION
-* Get Node Type of the Inform Info
+* Get Producer Type of the Inform Info
+* 13.4.8.3 InformInfo
*
* SYNOPSIS
*/
static inline ib_net32_t OSM_API
-ib_inform_info_get_node_type(
+ib_inform_info_get_prod_type(
IN const ib_inform_info_t *p_inf)
{
uint32_t nt;
@@ -7291,7 +7292,7 @@ ib_inform_info_get_node_type(
* [in] pointer to an inform info
*
* RETURN VALUES
-* The node type
+* The producer type
*
* NOTES
*
diff --git a/osm/opensm/osm_helper.c b/osm/opensm/osm_helper.c
index a1a2e93..523dbee 100644
--- a/osm/opensm/osm_helper.c
+++ b/osm/opensm/osm_helper.c
@@ -1405,7 +1405,7 @@ osm_dump_inform_info(
cl_ntoh16( p_ii->g_or_v.generic.trap_num ),
cl_ntoh32( qpn ),
resp_time_val,
- cl_ntoh32(ib_inform_info_get_node_type( p_ii ))
+ cl_ntoh32(ib_inform_info_get_prod_type( p_ii ))
);
}
else
@@ -1433,7 +1433,7 @@ osm_dump_inform_info(
cl_ntoh16( p_ii->g_or_v.vend.dev_id ),
cl_ntoh32( qpn ),
resp_time_val,
- cl_ntoh32(ib_inform_info_get_node_type( p_ii ))
+ cl_ntoh32(ib_inform_info_get_prod_type( p_ii ))
);
}
}
@@ -1489,7 +1489,7 @@ osm_dump_inform_info_record(
cl_ntoh16( p_iir->inform_info.g_or_v.generic.trap_num ),
cl_ntoh32( qpn ),
resp_time_val,
- cl_ntoh32(ib_inform_info_get_node_type( &p_iir->inform_info ))
+ cl_ntoh32(ib_inform_info_get_prod_type( &p_iir->inform_info ))
);
}
else
@@ -1525,7 +1525,7 @@ osm_dump_inform_info_record(
cl_ntoh16( p_iir->inform_info.g_or_v.vend.dev_id ),
cl_ntoh32( qpn ),
resp_time_val,
- cl_ntoh32(ib_inform_info_get_node_type( &p_iir->inform_info ))
+ cl_ntoh32(ib_inform_info_get_prod_type( &p_iir->inform_info ))
);
}
}
diff --git a/osm/opensm/osm_inform.c b/osm/opensm/osm_inform.c
index 5bac67f..e66c259 100644
--- a/osm/opensm/osm_inform.c
+++ b/osm/opensm/osm_inform.c
@@ -561,14 +561,14 @@ __match_notice_to_inf_rec(
}
/* ProducerType ProducerType match or 0xFFFFFF */
- if ( (cl_ntoh32(ib_inform_info_get_node_type(p_ii)) != 0xFFFFFF) &&
- (ib_inform_info_get_node_type(p_ii) !=
ib_notice_get_prod_type(p_ntc)) )
+ if ( (cl_ntoh32(ib_inform_info_get_prod_type(p_ii)) != 0xFFFFFF) &&
+ (ib_inform_info_get_prod_type(p_ii) !=
ib_notice_get_prod_type(p_ntc)) )
{
osm_log( p_log, OSM_LOG_DEBUG,
"__match_notice_to_inf_rec: "
"Mismatch by Node Type: II=0x%06X (%s) Trap=0x%06X (%s)\n",
- cl_ntoh32(ib_inform_info_get_node_type(p_ii)),
- ib_get_producer_type_str(ib_inform_info_get_node_type(p_ii)),
+ cl_ntoh32(ib_inform_info_get_prod_type(p_ii)),
+ ib_get_producer_type_str(ib_inform_info_get_prod_type(p_ii)),
cl_ntoh32(ib_notice_get_prod_type(p_ntc)),
ib_get_producer_type_str(ib_notice_get_prod_type(p_ntc))
);
diff --git a/osm/opensm/osm_sa.c b/osm/opensm/osm_sa.c
index 6d68ed2..4c0fbc3 100644
--- a/osm/opensm/osm_sa.c
+++ b/osm/opensm/osm_sa.c
@@ -647,7 +647,7 @@ sa_dump_one_inform(cl_list_item_t *p_lis
cl_ntoh16(p_iir->inform_info.trap_type),
cl_ntoh16(p_iir->inform_info.g_or_v.generic.trap_num),
cl_ntoh32(p_iir->inform_info.g_or_v.generic.qpn_resp_time_val),
- cl_ntoh32(ib_inform_info_get_node_type(&p_iir->inform_info)),
+ cl_ntoh32(ib_inform_info_get_prod_type(&p_iir->inform_info)),
cl_ntoh16(p_infr->report_addr.dest_lid),
p_infr->report_addr.path_bits,
p_infr->report_addr.static_rate,
_______________________________________________
general mailing list
[email protected]
http://lists.openfabrics.org/cgi-bin/mailman/listinfo/general
To unsubscribe, please visit http://openib.org/mailman/listinfo/openib-general
