OpenSM/osm_node_info_rcv.c: Eliminate superfluous call level Signed-off-by: Hal Rosenstock <[EMAIL PROTECTED]> Index: opensm/osm_node_info_rcv.c =================================================================== --- opensm/osm_node_info_rcv.c (revision 9536) +++ opensm/osm_node_info_rcv.c (working copy) @@ -437,7 +437,7 @@ __osm_ni_rcv_process_new_ca( The plock must be held before calling this function. **********************************************************************/ static void -__osm_ni_rcv_process_ca_port( +__osm_ni_rcv_process_existing_ca( IN const osm_ni_rcv_t* const p_rcv, IN osm_node_t* const p_node, IN const osm_madw_t* const p_madw ) @@ -455,7 +455,7 @@ __osm_ni_rcv_process_ca_port( osm_bind_handle_t h_bind; cl_status_t cl_status; - OSM_LOG_ENTER( p_rcv->p_log, __osm_ni_rcv_process_ca_port ); + OSM_LOG_ENTER( p_rcv->p_log, __osm_ni_rcv_process_existing_ca ); p_smp = osm_madw_get_smp_ptr( p_madw ); p_ni = (ib_node_info_t*)ib_smp_get_payload_ptr( p_smp ); @@ -473,7 +473,7 @@ __osm_ni_rcv_process_ca_port( if( p_port == (osm_port_t*)cl_qmap_end( p_guid_tbl ) ) { osm_log( p_rcv->p_log, OSM_LOG_VERBOSE, - "__osm_ni_rcv_process_ca_port: " + "__osm_ni_rcv_process_existing_ca: " "Creating new port object with GUID = 0x%" PRIx64 "\n", cl_ntoh64( p_ni->port_guid ) ); @@ -483,7 +483,7 @@ __osm_ni_rcv_process_ca_port( if( p_port == NULL ) { osm_log( p_rcv->p_log, OSM_LOG_ERROR, - "__osm_ni_rcv_process_ca_port: ERR 0D04: " + "__osm_ni_rcv_process_existing_ca: ERR 0D04: " "Unable to create new port object\n" ); goto Exit; } @@ -500,7 +500,7 @@ __osm_ni_rcv_process_ca_port( Somehow, this port GUID already exists in the table. */ osm_log( p_rcv->p_log, OSM_LOG_ERROR, - "__osm_ni_rcv_process_ca_port: ERR 0D12: " + "__osm_ni_rcv_process_existing_ca: ERR 0D12: " "Port 0x%" PRIx64 " already in the database!\n", cl_ntoh64( p_ni->port_guid ) ); @@ -521,7 +521,7 @@ __osm_ni_rcv_process_ca_port( if( cl_status != CL_SUCCESS ) { osm_log( p_rcv->p_log, OSM_LOG_ERROR, - "__osm_ni_rcv_process_ca_port: ERR 0D08: " + "__osm_ni_rcv_process_existing_ca: ERR 0D08: " "Error %s adding to list\n", CL_STATUS_MSG( cl_status ) ); osm_port_delete( &p_port ); @@ -530,7 +530,7 @@ __osm_ni_rcv_process_ca_port( else { osm_log( p_rcv->p_log, OSM_LOG_DEBUG, - "__osm_ni_rcv_process_ca_port: " + "__osm_ni_rcv_process_existing_ca: " "Adding port GUID:0x%016" PRIx64 " to new_ports_list\n", cl_ntoh64(osm_node_get_node_guid( p_port->p_node )) ); } @@ -547,7 +547,7 @@ __osm_ni_rcv_process_ca_port( if ( !osm_physp_is_valid( p_physp ) ) { osm_log( p_rcv->p_log, OSM_LOG_ERROR, - "__osm_ni_rcv_process_ca_port: ERR 0D19: " + "__osm_ni_rcv_process_existing_ca: ERR 0D19: " "Invalid physical port. Aborting discovery\n"); goto Exit; } @@ -579,7 +579,7 @@ __osm_ni_rcv_process_ca_port( if( status != IB_SUCCESS ) { osm_log( p_rcv->p_log, OSM_LOG_ERROR, - "__osm_ni_rcv_process_ca_port: ERR 0D13: " + "__osm_ni_rcv_process_existing_ca: ERR 0D13: " "Failure initiating PortInfo request (%s)\n", ib_get_err_str(status)); } @@ -592,22 +592,6 @@ __osm_ni_rcv_process_ca_port( The plock must be held before calling this function. **********************************************************************/ static void -__osm_ni_rcv_process_existing_ca( - IN const osm_ni_rcv_t* const p_rcv, - IN osm_node_t* const p_node, - IN const osm_madw_t* const p_madw ) -{ - OSM_LOG_ENTER( p_rcv->p_log, __osm_ni_rcv_process_existing_ca ); - - __osm_ni_rcv_process_ca_port( p_rcv, p_node, p_madw ); - - OSM_LOG_EXIT( p_rcv->p_log ); -} - -/********************************************************************** - The plock must be held before calling this function. -**********************************************************************/ -static void __osm_ni_rcv_process_new_router( IN const osm_ni_rcv_t* const p_rcv, IN osm_node_t* const p_node,
_______________________________________________ openib-general mailing list openib-general@openib.org http://openib.org/mailman/listinfo/openib-general To unsubscribe, please visit http://openib.org/mailman/listinfo/openib-general