From: eitan Date: Mon, 13 Mar 2006 08:06:38 +0000 (+0000) Subject: [OpenSM] - cosmetic changes X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=2187ba363ef55ae14e64cd2f109f8ad84f68bc28;p=~shefty%2Frdma-win.git [OpenSM] - cosmetic changes git-svn-id: svn://openib.tc.cornell.edu/gen1@242 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86 --- diff --git a/trunk/ulp/opensm/user/include/opensm/osm_base.h b/trunk/ulp/opensm/user/include/opensm/osm_base.h index 07b45e88..3fcf6195 100644 --- a/trunk/ulp/opensm/user/include/opensm/osm_base.h +++ b/trunk/ulp/opensm/user/include/opensm/osm_base.h @@ -304,7 +304,7 @@ BEGIN_C_DECLS * OSM_DEFAULT_LEAF_VL_STALL_COUNT * * DESCRIPTION -* Sets the number of contigious head of queue life time drops that +* Sets the number of contiguous head of queue life time drops that * puts the VL into stalled state. In stalled state the port supposed to * drop everything for 8*(head of queue lifetime) * We use here the value of 1 - so any drop due to HOQ means stalling the VL diff --git a/trunk/ulp/opensm/user/include/opensm/osm_subnet.h b/trunk/ulp/opensm/user/include/opensm/osm_subnet.h index c8c5e267..dcbacddf 100644 --- a/trunk/ulp/opensm/user/include/opensm/osm_subnet.h +++ b/trunk/ulp/opensm/user/include/opensm/osm_subnet.h @@ -675,7 +675,7 @@ struct _osm_port; * osm_get_gid_by_mad_addr * * DESCRIPTION -* Looks for the requestor gid in the mad address. +* Looks for the requester gid in the mad address. * * Note: This code is not thread safe. Need to grab the lock before * calling it. @@ -711,7 +711,7 @@ osm_get_gid_by_mad_addr( * osm_get_physp_by_mad_addr * * DESCRIPTION -* Looks for the requestor physical port in the mad address. +* Looks for the requester physical port in the mad address. * * Note: This code is not thread safe. Need to grab the lock before * calling it. @@ -735,7 +735,7 @@ osm_get_physp_by_mad_addr( * [in] Pointer to mad address object. * * RETURN VALUES -* Pointer to requestor physical port object if found. Null otherwise. +* Pointer to requester physical port object if found. Null otherwise. * * NOTES * @@ -747,7 +747,7 @@ osm_get_physp_by_mad_addr( * osm_get_port_by_mad_addr * * DESCRIPTION -* Looks for the requestor port in the mad address. +* Looks for the requester port in the mad address. * * Note: This code is not thread safe. Need to grab the lock before * calling it. @@ -771,7 +771,7 @@ osm_get_port_by_mad_addr( * [in] Pointer to mad address object. * * RETURN VALUES -* Pointer to requestor port object if found. Null otherwise. +* Pointer to requester port object if found. Null otherwise. * * NOTES * @@ -879,7 +879,7 @@ osm_get_port_by_guid( * osm_get_physp_by_mad_addr * * DESCRIPTION -* Looks for the requestor physical port in the mad address. +* Looks for the requester physical port in the mad address. * * Note: This code is not thread safe. Need to grab the lock before * calling it. @@ -903,7 +903,7 @@ osm_get_physp_by_mad_addr( * [in] Pointer to mad address object. * * RETURN VALUES -* Pointer to requestor physical port object if found. Null otherwise. +* Pointer to requester physical port object if found. Null otherwise. * * NOTES * diff --git a/trunk/ulp/opensm/user/opensm/osm_lid_mgr.c b/trunk/ulp/opensm/user/opensm/osm_lid_mgr.c index 3473041c..c481dd58 100644 --- a/trunk/ulp/opensm/user/opensm/osm_lid_mgr.c +++ b/trunk/ulp/opensm/user/opensm/osm_lid_mgr.c @@ -899,6 +899,7 @@ __osm_lid_mgr_set_remote_pi_state_to_init( { ib_port_info_t *p_pi; osm_physp_t *p_rem_port = osm_physp_get_remote(p_physp); + CL_ASSERT(p_rem_port); p_pi = osm_physp_get_port_info_ptr( p_rem_port ); diff --git a/trunk/ulp/opensm/user/opensm/osm_mcast_mgr.c b/trunk/ulp/opensm/user/opensm/osm_mcast_mgr.c index 8dcf6cf2..0c683de8 100644 --- a/trunk/ulp/opensm/user/opensm/osm_mcast_mgr.c +++ b/trunk/ulp/opensm/user/opensm/osm_mcast_mgr.c @@ -814,7 +814,7 @@ __osm_mcast_mgr_branch( */ osm_mcast_tbl_set( p_tbl, mlid_ho, i ); if (i == 0) - /* This means we are adding the switch to the mc group. + /* This means we are adding the switch to the MC group. We do not need to continue looking at the remote port, just needed to add the port to the table */ continue; diff --git a/trunk/ulp/opensm/user/opensm/osm_sa.c b/trunk/ulp/opensm/user/opensm/osm_sa.c index f7b14057..d74301c8 100644 --- a/trunk/ulp/opensm/user/opensm/osm_sa.c +++ b/trunk/ulp/opensm/user/opensm/osm_sa.c @@ -561,7 +561,7 @@ osm_sa_create_template_record_ipoib( /* * HACK: Until TS resolves their noncompliant join compmask - * we have to pre-define the MGID + * we have to predefine the MGID */ mc_rec.mgid = osm_ts_ipoib_mgid; osm_sa_add_well_known_mc_record(&p_sa->mcmr_rcv, &mc_rec); @@ -598,7 +598,7 @@ osm_sa_add_well_known_mc_record( { osm_log( p_mcmr->p_log, OSM_LOG_DEBUG, "osm_sa_add_well_known_mc_record:" - "failed to create a well known group\n"); + "Failed to create a well known group\n"); } diff --git a/trunk/ulp/opensm/user/opensm/osm_sa_guidinfo_record.c b/trunk/ulp/opensm/user/opensm/osm_sa_guidinfo_record.c index 6b916195..adba80e1 100644 --- a/trunk/ulp/opensm/user/opensm/osm_sa_guidinfo_record.c +++ b/trunk/ulp/opensm/user/opensm/osm_sa_guidinfo_record.c @@ -241,8 +241,8 @@ __osm_sa_gir_create_gir( if( !osm_physp_is_valid( p_physp ) ) continue; - /* Check to see if the found p_physp and the requestor physp - share a pkey. If not - continue */ + /* Check to see if the found p_physp and the requester physp + share a pkey. If not, continue */ if (!osm_physp_share_pkey( p_rcv->p_log, p_physp, p_req_physp ) ) continue; @@ -441,7 +441,7 @@ osm_gir_rcv_process( CL_ASSERT( p_rcvd_mad->attr_id == IB_MAD_ATTR_GUIDINFO_RECORD ); - /* update the requestor physical port. */ + /* update the requester physical port. */ p_req_physp = osm_get_physp_by_mad_addr(p_rcv->p_log, p_rcv->p_subn, osm_madw_get_mad_addr_ptr(p_madw) ); @@ -449,7 +449,7 @@ osm_gir_rcv_process( { osm_log( p_rcv->p_log, OSM_LOG_ERROR, "osm_gir_rcv_process: ERR 5104: " - "Cannot find requestor physical port\n" ); + "Cannot find requester physical port\n" ); goto Exit; } diff --git a/trunk/ulp/opensm/user/opensm/osm_sa_informinfo.c b/trunk/ulp/opensm/user/opensm/osm_sa_informinfo.c index 4cf2ff9b..6dd4876f 100644 --- a/trunk/ulp/opensm/user/opensm/osm_sa_informinfo.c +++ b/trunk/ulp/opensm/user/opensm/osm_sa_informinfo.c @@ -127,7 +127,7 @@ __validate_ports_access_rights( IN osm_infr_t* p_infr_rec) { boolean_t valid = TRUE; - osm_physp_t* p_requestor_physp; + osm_physp_t* p_requester_physp; osm_port_t* p_port; osm_physp_t* p_physp; ib_net64_t portguid; @@ -139,8 +139,8 @@ __validate_ports_access_rights( OSM_LOG_ENTER( p_rcv->p_log, __validate_ports_access_rights ); - /* get the requestor physp from the request address */ - p_requestor_physp = osm_get_physp_by_mad_addr(p_rcv->p_log, + /* get the requester physp from the request address */ + p_requester_physp = osm_get_physp_by_mad_addr(p_rcv->p_log, p_rcv->p_subn, &p_infr_rec->report_addr ); @@ -166,13 +166,13 @@ __validate_ports_access_rights( /* get the destination informInfo physical port */ p_physp = osm_port_get_default_phys_ptr(p_port); - /* make sure that the requestor and destination port can access each other + /* make sure that the requester and destination port can access each other according to the current partitioning. */ - if (! osm_physp_share_pkey( p_rcv->p_log, p_physp, p_requestor_physp)) + if (! osm_physp_share_pkey( p_rcv->p_log, p_physp, p_requester_physp)) { osm_log( p_rcv->p_log, OSM_LOG_DEBUG, "__validate_ports_access_rights: " - "port and requestor don't share pkey\n" ); + "port and requester don't share pkey\n" ); valid = FALSE; goto Exit; } @@ -191,7 +191,7 @@ __validate_ports_access_rights( lid_range_end = lid_range_begin; /* go over all defined lids within the range and make sure that the - requestor port can access them according to current partitioning. */ + requester port can access them according to current partitioning. */ for ( lid = lid_range_begin ; lid <= lid_range_end ; lid++ ) { p_tbl = &p_rcv->p_subn->port_lid_tbl; @@ -213,13 +213,13 @@ __validate_ports_access_rights( continue; p_physp = osm_port_get_default_phys_ptr(p_port); - /* make sure that the requestor and destination port can access each other + /* make sure that the requester and destination port can access each other according to the current partitioning. */ - if (! osm_physp_share_pkey( p_rcv->p_log, p_physp, p_requestor_physp)) + if (! osm_physp_share_pkey( p_rcv->p_log, p_physp, p_requester_physp)) { osm_log( p_rcv->p_log, OSM_LOG_DEBUG, "__validate_ports_access_rights: " - "port and requestor don't share pkey\n" ); + "port and requester don't share pkey\n" ); valid = FALSE; goto Exit; } diff --git a/trunk/ulp/opensm/user/opensm/osm_sa_lft_record.c b/trunk/ulp/opensm/user/opensm/osm_sa_lft_record.c index 7c54edb4..549a7c01 100644 --- a/trunk/ulp/opensm/user/opensm/osm_sa_lft_record.c +++ b/trunk/ulp/opensm/user/opensm/osm_sa_lft_record.c @@ -252,7 +252,7 @@ __osm_lftr_rcv_by_comp_mask( /* get the port 0 of the switch */ osm_port_get_lid_range_ho( p_port, &min_lid_ho, &max_lid_ho ); - /* check that the requestor physp and the current physp are under + /* check that the requester physp and the current physp are under the same partition. */ p_physp = osm_port_get_default_phys_ptr( p_port ); if (! p_physp) @@ -337,7 +337,7 @@ osm_lftr_rcv_process( CL_ASSERT( p_rcvd_mad->attr_id == IB_MAD_ATTR_LFT_RECORD ); - /* update the requestor physical port. */ + /* update the requester physical port. */ p_req_physp = osm_get_physp_by_mad_addr(p_rcv->p_log, p_rcv->p_subn, osm_madw_get_mad_addr_ptr(p_madw) ); @@ -345,7 +345,7 @@ osm_lftr_rcv_process( { osm_log( p_rcv->p_log, OSM_LOG_ERROR, "osm_lftr_rcv_process: ERR 4407: " - "Cannot find requestor physical port\n" ); + "Cannot find requester physical port\n" ); goto Exit; } diff --git a/trunk/ulp/opensm/user/opensm/osm_sa_link_record.c b/trunk/ulp/opensm/user/opensm/osm_sa_link_record.c index 2db42f86..f7b1a308 100644 --- a/trunk/ulp/opensm/user/opensm/osm_sa_link_record.c +++ b/trunk/ulp/opensm/user/opensm/osm_sa_link_record.c @@ -766,7 +766,7 @@ osm_lr_rcv_process( CL_ASSERT( p_sa_mad->attr_id == IB_MAD_ATTR_LINK_RECORD ); - /* update the requestor physical port. */ + /* update the requester physical port. */ p_req_physp = osm_get_physp_by_mad_addr(p_rcv->p_log, p_rcv->p_subn, osm_madw_get_mad_addr_ptr(p_madw) ); @@ -774,7 +774,7 @@ osm_lr_rcv_process( { osm_log( p_rcv->p_log, OSM_LOG_ERROR, "osm_lr_rcv_process: ERR 1805: " - "Cannot find requestor physical port\n" ); + "Cannot find requester physical port\n" ); goto Exit; } diff --git a/trunk/ulp/opensm/user/opensm/osm_sa_mcmember_record.c b/trunk/ulp/opensm/user/opensm/osm_sa_mcmember_record.c index b4da07ce..1460cc81 100644 --- a/trunk/ulp/opensm/user/opensm/osm_sa_mcmember_record.c +++ b/trunk/ulp/opensm/user/opensm/osm_sa_mcmember_record.c @@ -416,7 +416,7 @@ __cleanup_mgrp( /********************************************************************* Add a port to the group. Calculating its PROXY_JOIN by the Port and -requestor gids. +requester gids. **********************************************************************/ static ib_api_status_t @@ -428,15 +428,15 @@ __add_new_mgrp_port( OUT osm_mcm_port_t **pp_mcmr_port) { boolean_t proxy_join; - ib_gid_t requestor_gid; + ib_gid_t requester_gid; - /* set the proxy_join if the requestor gid is not identical to the + /* set the proxy_join if the requester gid is not identical to the joined gid */ - requestor_gid = osm_get_gid_by_mad_addr( p_rcv->p_log, + requester_gid = osm_get_gid_by_mad_addr( p_rcv->p_log, p_rcv->p_subn, p_mad_addr ); - if (! cl_memcmp(&p_recvd_mcmember_rec->port_gid, &requestor_gid, + if (! cl_memcmp(&p_recvd_mcmember_rec->port_gid, &requester_gid, sizeof(ib_gid_t))) { proxy_join = FALSE; @@ -447,7 +447,7 @@ __add_new_mgrp_port( else { /* The port is not the one specified in PortGID. - The check that the requestor is in the same partition as + The check that the requester is in the same partition as the PortGID is done before - just need to update the proxy_join. */ proxy_join = TRUE; osm_log( p_rcv->p_log, OSM_LOG_DEBUG, @@ -764,7 +764,7 @@ __validate_modify(IN osm_mcmr_recv_t* const p_rcv, if ( (*pp_mcm_port)->proxy_join == FALSE ) { /* The proxy_join is not set. Modifying can by done only - if the requestor GID == PortGID */ + if the requester GID == PortGID */ request_gid = osm_get_gid_by_mad_addr(p_rcv->p_log, p_rcv->p_subn, p_mad_addr ); @@ -784,7 +784,7 @@ __validate_modify(IN osm_mcmr_recv_t* const p_rcv, else { /* the proxy_join is set. Modification allowed only if the - requestor is part of the partition for this MCMemberRecord */ + requester is part of the partition for this MCMemberRecord */ p_request_physp = osm_get_physp_by_mad_addr(p_rcv->p_log, p_rcv->p_subn, p_mad_addr ); @@ -1098,7 +1098,7 @@ __mgrp_request_is_realizable( use the smaller of the two: a. one lower then the required b. the mtu of the requesting port - If the p_pi is NULL, this means there is no requestor port and + If the p_pi is NULL, this means there is no requester port and just use mtu one lower than the required. */ if ( mtu_required > 1 ) { @@ -1174,7 +1174,7 @@ __mgrp_request_is_realizable( use the smaller of the two: a. one lower then the required b. the rate of the requesting port - If the p_pi is NULL, this means there is no requestor port and + If the p_pi is NULL, this means there is no requester port and just use rate one lower than the required. */ if ( rate_required > 2 ) @@ -1578,7 +1578,7 @@ osm_mcmr_rcv_join_mgrp( osm_log( p_rcv->p_log, OSM_LOG_DEBUG, "osm_mcmr_rcv_join_mgrp: " - "Invalid portguid =< 0x%016" PRIx64 "\n", + "Unknown portguid 0x%016" PRIx64 "\n", portguid); sa_status = IB_SA_MAD_STATUS_REQ_INVALID; osm_sa_send_error( p_rcv->p_resp, p_madw, sa_status); @@ -1586,7 +1586,7 @@ osm_mcmr_rcv_join_mgrp( } p_physp = osm_port_get_default_phys_ptr(p_port); - /* Check that the p_physp and the requestor physp are in the same + /* Check that the p_physp and the requester physp are in the same partition. */ p_request_physp = osm_get_physp_by_mad_addr(p_rcv->p_log, @@ -1604,7 +1604,7 @@ osm_mcmr_rcv_join_mgrp( osm_log( p_rcv->p_log, OSM_LOG_DEBUG, "osm_mcmr_rcv_join_mgrp: " - "port and requestor don't share pkey\n" ); + "port and requester don't share pkey\n" ); sa_status = IB_SA_MAD_STATUS_REQ_INVALID; osm_sa_send_error( p_rcv->p_resp, p_madw, sa_status); goto Exit; @@ -1865,7 +1865,7 @@ __osm_mcmr_rcv_new_mcmr( cl_memclr( &p_rec_item->rec, sizeof( p_rec_item->rec ) ); - /* HACK: Not trusted requestors should result with 0 Join + /* HACK: Not trusted requesters should result with 0 Join State, Port Guid, and Proxy */ p_rec_item->rec = *p_rcvd_rec; cl_qlist_insert_tail( p_list, (cl_list_item_t*)&p_rec_item->pool_item ); @@ -1927,7 +1927,7 @@ __osm_sa_mcm_by_comp_mask_cb( goto Exit; } - /* if the requestor physical port doesn't have the pkey that is defined for the + /* if the requester physical port doesn't have the pkey that is defined for the group - exit. */ if (! osm_physp_has_pkey( p_rcv->p_log, p_mgrp->mcmember_rec.pkey, p_req_physp )) goto Exit; @@ -2054,7 +2054,7 @@ osm_mcmr_query_mgrp(IN osm_mcmr_recv_t* const p_rcv, CL_ASSERT( p_rcvd_mad->attr_id == IB_MAD_ATTR_MCMEMBER_RECORD ); - /* update the requestor physical port. */ + /* update the requester physical port. */ p_req_physp = osm_get_physp_by_mad_addr(p_rcv->p_log, p_rcv->p_subn, osm_madw_get_mad_addr_ptr(p_madw) ); @@ -2062,7 +2062,7 @@ osm_mcmr_query_mgrp(IN osm_mcmr_recv_t* const p_rcv, { osm_log( p_rcv->p_log, OSM_LOG_ERROR, "osm_mcmr_query_mgrp: ERR 1B04: " - "Cannot find requestor physical port\n" ); + "Cannot find requester physical port\n" ); goto Exit; } diff --git a/trunk/ulp/opensm/user/opensm/osm_sa_node_record.c b/trunk/ulp/opensm/user/opensm/osm_sa_node_record.c index d86134ad..2862af81 100644 --- a/trunk/ulp/opensm/user/opensm/osm_sa_node_record.c +++ b/trunk/ulp/opensm/user/opensm/osm_sa_node_record.c @@ -233,7 +233,7 @@ __osm_nr_rcv_create_nr( if( !osm_physp_is_valid( p_physp ) ) continue; - /* Check to see if the found p_physp and the requestor physp + /* Check to see if the found p_physp and the requester physp share a pkey. If not - continue */ if (!osm_physp_share_pkey( p_rcv->p_log, p_physp, p_req_physp ) ) continue; @@ -443,7 +443,7 @@ osm_nr_rcv_process( CL_ASSERT( p_rcvd_mad->attr_id == IB_MAD_ATTR_NODE_RECORD ); - /* update the requestor physical port. */ + /* update the requester physical port. */ p_req_physp = osm_get_physp_by_mad_addr(p_rcv->p_log, p_rcv->p_subn, osm_madw_get_mad_addr_ptr(p_madw) ); @@ -451,7 +451,7 @@ osm_nr_rcv_process( { osm_log( p_rcv->p_log, OSM_LOG_ERROR, "osm_nr_rcv_process: ERR 1D04: " - "Cannot find requestor physical port\n" ); + "Cannot find requester physical port\n" ); goto Exit; } diff --git a/trunk/ulp/opensm/user/opensm/osm_sa_path_record.c b/trunk/ulp/opensm/user/opensm/osm_sa_path_record.c index 9a4f5b23..e82b2312 100644 --- a/trunk/ulp/opensm/user/opensm/osm_sa_path_record.c +++ b/trunk/ulp/opensm/user/opensm/osm_sa_path_record.c @@ -1107,7 +1107,7 @@ static void __osm_pr_rcv_process_world( IN osm_pr_rcv_t* const p_rcv, IN const osm_madw_t* const p_madw, - IN const osm_port_t* const requestor_port, + IN const osm_port_t* const requester_port, IN const ib_net64_t comp_mask, IN cl_qlist_t* const p_list ) { @@ -1133,7 +1133,7 @@ __osm_pr_rcv_process_world( p_src_port = (osm_port_t*)cl_qmap_head( p_tbl ); while( p_src_port != (osm_port_t*)cl_qmap_end( p_tbl ) ) { - __osm_pr_rcv_get_port_pair_paths( p_rcv, p_madw, requestor_port, p_src_port, + __osm_pr_rcv_get_port_pair_paths( p_rcv, p_madw, requester_port, p_src_port, p_dest_port, comp_mask, p_list ); p_src_port = (osm_port_t*)cl_qmap_next( &p_src_port->map_item ); @@ -1151,7 +1151,7 @@ static void __osm_pr_rcv_process_half( IN osm_pr_rcv_t* const p_rcv, IN const osm_madw_t* const p_madw, - IN const osm_port_t* const requestor_port, + IN const osm_port_t* const requester_port, IN const osm_port_t* const p_src_port, IN const osm_port_t* const p_dest_port, IN const ib_net64_t comp_mask, @@ -1177,7 +1177,7 @@ __osm_pr_rcv_process_half( p_port = (osm_port_t*)cl_qmap_head( p_tbl ); while( p_port != (osm_port_t*)cl_qmap_end( p_tbl ) ) { - __osm_pr_rcv_get_port_pair_paths( p_rcv, p_madw , requestor_port, p_src_port, + __osm_pr_rcv_get_port_pair_paths( p_rcv, p_madw , requester_port, p_src_port, p_port, comp_mask, p_list ); p_port = (osm_port_t*)cl_qmap_next( &p_port->map_item ); } @@ -1190,7 +1190,7 @@ __osm_pr_rcv_process_half( p_port = (osm_port_t*)cl_qmap_head( p_tbl ); while( p_port != (osm_port_t*)cl_qmap_end( p_tbl ) ) { - __osm_pr_rcv_get_port_pair_paths( p_rcv, p_madw, requestor_port, p_port, + __osm_pr_rcv_get_port_pair_paths( p_rcv, p_madw, requester_port, p_port, p_dest_port, comp_mask, p_list ); p_port = (osm_port_t*)cl_qmap_next( &p_port->map_item ); } @@ -1205,7 +1205,7 @@ static void __osm_pr_rcv_process_pair( IN osm_pr_rcv_t* const p_rcv, IN const osm_madw_t* const p_madw, - IN const osm_port_t* const requestor_port, + IN const osm_port_t* const requester_port, IN const osm_port_t* const p_src_port, IN const osm_port_t* const p_dest_port, IN const ib_net64_t comp_mask, @@ -1213,7 +1213,7 @@ __osm_pr_rcv_process_pair( { OSM_LOG_ENTER( p_rcv->p_log, __osm_pr_rcv_process_pair ); - __osm_pr_rcv_get_port_pair_paths( p_rcv, p_madw, requestor_port, p_src_port, + __osm_pr_rcv_get_port_pair_paths( p_rcv, p_madw, requester_port, p_src_port, p_dest_port, comp_mask, p_list ); OSM_LOG_EXIT( p_rcv->p_log ); @@ -1656,22 +1656,22 @@ osm_pr_rcv_process( const osm_port_t* p_dest_port; cl_qlist_t pr_list; ib_net16_t sa_status; - osm_port_t* requestor_port; + osm_port_t* requester_port; OSM_LOG_ENTER( p_rcv->p_log, osm_pr_rcv_process ); CL_ASSERT( p_madw ); - /* update the requestor physical port. */ - requestor_port = + /* update the requester physical port. */ + requester_port = osm_get_port_by_mad_addr(p_rcv->p_log, p_rcv->p_subn, osm_madw_get_mad_addr_ptr(p_madw) ); - if (requestor_port == NULL) + if (requester_port == NULL) { osm_log( p_rcv->p_log, OSM_LOG_ERROR, "osm_pr_rcv_process: ERR 1F16: " - "Cannot find requestor physical port\n" ); + "Cannot find requester physical port\n" ); goto Exit; } @@ -1726,22 +1726,22 @@ osm_pr_rcv_process( if( p_src_port ) { if( p_dest_port ) - __osm_pr_rcv_process_pair( p_rcv, p_madw, requestor_port, p_src_port, p_dest_port, + __osm_pr_rcv_process_pair( p_rcv, p_madw, requester_port, p_src_port, p_dest_port, p_sa_mad->comp_mask, &pr_list ); else - __osm_pr_rcv_process_half( p_rcv, p_madw, requestor_port, p_src_port, NULL, + __osm_pr_rcv_process_half( p_rcv, p_madw, requester_port, p_src_port, NULL, p_sa_mad->comp_mask, &pr_list ); } else { if( p_dest_port ) - __osm_pr_rcv_process_half( p_rcv, p_madw, requestor_port, NULL, p_dest_port, + __osm_pr_rcv_process_half( p_rcv, p_madw, requester_port, NULL, p_dest_port, p_sa_mad->comp_mask, &pr_list ); else /* Katie, bar the door! */ - __osm_pr_rcv_process_world( p_rcv, p_madw, requestor_port, + __osm_pr_rcv_process_world( p_rcv, p_madw, requester_port, p_sa_mad->comp_mask, &pr_list ); } goto Unlock; diff --git a/trunk/ulp/opensm/user/opensm/osm_sa_pkey_record.c b/trunk/ulp/opensm/user/opensm/osm_sa_pkey_record.c index 27b3da15..cfdcd10d 100644 --- a/trunk/ulp/opensm/user/opensm/osm_sa_pkey_record.c +++ b/trunk/ulp/opensm/user/opensm/osm_sa_pkey_record.c @@ -289,7 +289,7 @@ __osm_sa_pkey_by_comp_mask( if( !osm_physp_is_valid( p_physp ) ) continue; - /* if the requestor and the p_physp don't share a pkey - + /* if the requester and the p_physp don't share a pkey - continue */ if (!osm_physp_share_pkey(p_rcv->p_log, p_req_physp, p_physp ) ) continue; @@ -353,7 +353,7 @@ osm_pkey_rec_rcv_process( CL_ASSERT( p_rcvd_mad->attr_id == IB_MAD_ATTR_PKEY_TBL_RECORD ); - /* update the requestor physical port. */ + /* update the requester physical port. */ p_req_physp = osm_get_physp_by_mad_addr(p_rcv->p_log, p_rcv->p_subn, osm_madw_get_mad_addr_ptr(p_madw) ); @@ -361,7 +361,7 @@ osm_pkey_rec_rcv_process( { osm_log( p_rcv->p_log, OSM_LOG_ERROR, "osm_pkey_rec_rcv_process: ERR 4604: " - "Cannot find requestor physical port\n" ); + "Cannot find requester physical port\n" ); goto Exit; } @@ -379,14 +379,14 @@ osm_pkey_rec_rcv_process( /* p819 - P_KeyTableRecords shall only be provided in response to trusted requests. - Check that the requestor is a trusted one. + Check that the requester is a trusted one. */ if ( p_rcvd_mad->sm_key != p_rcv->p_subn->opt.sm_key ) { - /* This is not a trusted requestor! */ + /* This is not a trusted requester! */ osm_log( p_rcv->p_log, OSM_LOG_ERROR, "osm_pkey_rec_rcv_process ERR 4608: " - "Request from non-trusted requestor: " + "Request from non-trusted requester: " "Given SM_Key:0x%016" PRIx64 "\n", cl_ntoh64(p_rcvd_mad->sm_key) ); osm_sa_send_error( p_rcv->p_resp, p_madw, IB_SA_MAD_STATUS_REQ_INVALID); diff --git a/trunk/ulp/opensm/user/opensm/osm_sa_portinfo_record.c b/trunk/ulp/opensm/user/opensm/osm_sa_portinfo_record.c index 933970a3..aeb40734 100644 --- a/trunk/ulp/opensm/user/opensm/osm_sa_portinfo_record.c +++ b/trunk/ulp/opensm/user/opensm/osm_sa_portinfo_record.c @@ -544,7 +544,7 @@ __osm_sa_pir_by_comp_mask( if( !osm_physp_is_valid( p_physp ) ) continue; - /* if the requestor and the p_physp don't share a pkey - + /* if the requester and the p_physp don't share a pkey - continue */ if (!osm_physp_share_pkey(p_rcv->p_log, p_req_physp, p_physp ) ) continue; @@ -609,7 +609,7 @@ osm_pir_rcv_process( CL_ASSERT( p_rcvd_mad->attr_id == IB_MAD_ATTR_PORTINFO_RECORD ); - /* update the requestor physical port. */ + /* update the requester physical port. */ p_req_physp = osm_get_physp_by_mad_addr(p_rcv->p_log, p_rcv->p_subn, osm_madw_get_mad_addr_ptr(p_madw) ); @@ -617,7 +617,7 @@ osm_pir_rcv_process( { osm_log( p_rcv->p_log, OSM_LOG_ERROR, "osm_pir_rcv_process: ERR 2104: " - "Cannot find requestor physical port\n" ); + "Cannot find requester physical port\n" ); goto Exit; } diff --git a/trunk/ulp/opensm/user/opensm/osm_sa_service_record.c b/trunk/ulp/opensm/user/opensm/osm_sa_service_record.c index 5269d25c..25c8b09d 100644 --- a/trunk/ulp/opensm/user/opensm/osm_sa_service_record.c +++ b/trunk/ulp/opensm/user/opensm/osm_sa_service_record.c @@ -173,7 +173,7 @@ __match_service_pkey_with_ports_pkey( ib_net64_t service_guid; osm_port_t *service_port; - /* update the requestor physical port. */ + /* update the requester physical port. */ p_req_physp = osm_get_physp_by_mad_addr(p_rcv->p_log, p_rcv->p_subn, osm_madw_get_mad_addr_ptr(p_madw) ); @@ -181,14 +181,14 @@ __match_service_pkey_with_ports_pkey( { osm_log( p_rcv->p_log, OSM_LOG_ERROR, "__match_service_pkey_with_ports_pkey: ERR 2404: " - "Cannot find requestor physical port\n" ); + "Cannot find requester physical port\n" ); valid = FALSE; goto Exit; } if((comp_mask & IB_SR_COMPMASK_SPKEY) == IB_SR_COMPMASK_SPKEY) { - /* We have a ServiceP_Key - check matching on requestor port, and + /* We have a ServiceP_Key - check matching on requester port, and ServiceGid port (if such exists) */ /* Make sure it matches the p_req_physp */ if (!osm_physp_has_pkey(p_rcv->p_log, p_service_rec->service_pkey, p_req_physp )) @@ -725,7 +725,7 @@ __get_matching_sr( return; } - /* Check that the requestor port has the pkey which is the service_pkey. + /* Check that the requester port has the pkey which is the service_pkey. If not - then it cannot receive this ServiceRecord. */ /* The check is relevant only if the service_pkey is valid */ if (!ib_pkey_is_invalid(p_svcr->service_record.service_pkey)) @@ -736,7 +736,7 @@ __get_matching_sr( { osm_log( p_sr_item->p_rcv->p_log, OSM_LOG_VERBOSE, "__get_matching_sr: " - "requestor port doesn't have the service_pkey: 0x%X\n", + "requester port doesn't have the service_pkey: 0x%X\n", cl_ntoh16(p_svcr->service_record.service_pkey) ); return; } @@ -779,7 +779,7 @@ osm_sr_rcv_process_get_method( CL_ASSERT( p_madw ); - /* update the requestor physical port. */ + /* update the requester physical port. */ p_req_physp = osm_get_physp_by_mad_addr(p_rcv->p_log, p_rcv->p_subn, osm_madw_get_mad_addr_ptr(p_madw) ); @@ -787,7 +787,7 @@ osm_sr_rcv_process_get_method( { osm_log( p_rcv->p_log, OSM_LOG_ERROR, "osm_sr_rcv_process_get_method: ERR 2409: " - "Cannot find requestor physical port\n" ); + "Cannot find requester physical port\n" ); goto Exit; } diff --git a/trunk/ulp/opensm/user/opensm/osm_sa_slvl_record.c b/trunk/ulp/opensm/user/opensm/osm_sa_slvl_record.c index 35d6f2fb..339a831b 100644 --- a/trunk/ulp/opensm/user/opensm/osm_sa_slvl_record.c +++ b/trunk/ulp/opensm/user/opensm/osm_sa_slvl_record.c @@ -269,7 +269,7 @@ __osm_sa_slvl_by_comp_mask( if( !osm_physp_is_valid( p_in_physp ) ) continue; - /* if the requestor and the p_out_physp don't share a pkey - + /* if the requester and the p_out_physp don't share a pkey - continue */ if (!osm_physp_share_pkey(p_rcv->p_log, p_req_physp, p_out_physp ) ) continue; @@ -333,7 +333,7 @@ osm_slvl_rec_rcv_process( CL_ASSERT( p_rcvd_mad->attr_id == IB_MAD_ATTR_SLVL_RECORD ); - /* update the requestor physical port. */ + /* update the requester physical port. */ p_req_physp = osm_get_physp_by_mad_addr(p_rcv->p_log, p_rcv->p_subn, osm_madw_get_mad_addr_ptr(p_madw) ); @@ -341,7 +341,7 @@ osm_slvl_rec_rcv_process( { osm_log( p_rcv->p_log, OSM_LOG_ERROR, "osm_slvl_rec_rcv_process: ERR 2603: " - "Cannot find requestor physical port\n" ); + "Cannot find requester physical port\n" ); goto Exit; } diff --git a/trunk/ulp/opensm/user/opensm/osm_sa_sminfo_record.c b/trunk/ulp/opensm/user/opensm/osm_sa_sminfo_record.c index b300b19b..f7bd45cc 100644 --- a/trunk/ulp/opensm/user/opensm/osm_sa_sminfo_record.c +++ b/trunk/ulp/opensm/user/opensm/osm_sa_sminfo_record.c @@ -148,7 +148,7 @@ osm_smir_rcv_process( p_sa_mad = osm_madw_get_sa_mad_ptr( p_madw ); p_sminfo_rec = (ib_sminfo_record_t*)ib_sa_mad_get_payload_ptr( p_sa_mad ); - /* update the requestor physical port. */ + /* update the requester physical port. */ p_req_physp = osm_get_physp_by_mad_addr(p_rcv->p_log, p_rcv->p_subn, osm_madw_get_mad_addr_ptr(p_madw) ); @@ -156,7 +156,7 @@ osm_smir_rcv_process( { osm_log( p_rcv->p_log, OSM_LOG_ERROR, "osm_smir_rcv_process: ERR 2803: " - "Cannot find requestor physical port\n" ); + "Cannot find requester physical port\n" ); goto Exit; } diff --git a/trunk/ulp/opensm/user/opensm/osm_sa_vlarb_record.c b/trunk/ulp/opensm/user/opensm/osm_sa_vlarb_record.c index 17aa03ae..f85b7c93 100644 --- a/trunk/ulp/opensm/user/opensm/osm_sa_vlarb_record.c +++ b/trunk/ulp/opensm/user/opensm/osm_sa_vlarb_record.c @@ -266,7 +266,7 @@ __osm_sa_vl_arb_by_comp_mask( if (port_num < osm_port_get_num_physp( p_port )) { p_physp = osm_port_get_phys_ptr( p_port, port_num ); - /* check that the p_physp is valid, and that the requestor + /* check that the p_physp is valid, and that the requester and the p_physp share a pkey. */ if( p_physp && osm_physp_is_valid( p_physp ) && osm_physp_share_pkey(p_rcv->p_log, p_req_physp, p_physp) ) @@ -293,7 +293,7 @@ __osm_sa_vl_arb_by_comp_mask( if( !osm_physp_is_valid( p_physp ) ) continue; - /* if the requestor and the p_physp don't share a pkey - + /* if the requester and the p_physp don't share a pkey - continue */ if (!osm_physp_share_pkey(p_rcv->p_log, p_req_physp, p_physp)) continue; @@ -349,7 +349,7 @@ osm_vlarb_rec_rcv_process( OSM_LOG_ENTER( p_rcv->p_log, osm_vlarb_rec_rcv_process ); - /* update the requestor physical port. */ + /* update the requester physical port. */ p_req_physp = osm_get_physp_by_mad_addr(p_rcv->p_log, p_rcv->p_subn, osm_madw_get_mad_addr_ptr(p_madw) ); @@ -357,7 +357,7 @@ osm_vlarb_rec_rcv_process( { osm_log( p_rcv->p_log, OSM_LOG_ERROR, "osm_vlarb_rec_rcv_process: ERR 2A04: " - "Cannot find requestor physical port\n" ); + "Cannot find requester physical port\n" ); goto Exit; } diff --git a/trunk/ulp/opensm/user/opensm/osm_sminfo_rcv.c b/trunk/ulp/opensm/user/opensm/osm_sminfo_rcv.c index 75c51eb8..20df8b6b 100755 --- a/trunk/ulp/opensm/user/opensm/osm_sminfo_rcv.c +++ b/trunk/ulp/opensm/user/opensm/osm_sminfo_rcv.c @@ -166,7 +166,7 @@ __osm_sminfo_rcv_process_get_request( p_rcv->p_subn->opt.sm_priority << 4); /* p.750 row 11 - Return 0 for the SM key unless we authenticate the - requestor as the master SM. + requester as the master SM. */ p_remote_smi = ib_smp_get_payload_ptr ( osm_madw_get_smp_ptr (p_madw) ); if (ib_sminfo_get_state( p_remote_smi ) == IB_SMINFO_STATE_MASTER ) @@ -178,7 +178,7 @@ __osm_sminfo_rcv_process_get_request( } else { - /* The requestor is not authenticated as master - set sm_key to zero. */ + /* The requester is not authenticated as master - set sm_key to zero. */ osm_log( p_rcv->p_log, OSM_LOG_DEBUG, "__osm_sminfo_rcv_process_get_request: " "Responding to SM not master with zero sm_key\n" ); @@ -284,7 +284,7 @@ __osm_sminfo_rcv_process_set_request( p_rcv->p_subn->opt.sm_priority << 4); /* p.750 row 11 - Return 0 for the SM key unless we authenticate the - requestor as the master SM. + requester as the master SM. */ p_remote_smi = ib_smp_get_payload_ptr ( osm_madw_get_smp_ptr (p_madw) ); if (ib_sminfo_get_state( p_remote_smi ) == IB_SMINFO_STATE_MASTER ) @@ -296,7 +296,7 @@ __osm_sminfo_rcv_process_set_request( } else { - /* The requestor is not authenticated as master - set sm_key to zero. */ + /* The requester is not authenticated as master - set sm_key to zero. */ osm_log( p_rcv->p_log, OSM_LOG_DEBUG, "__osm_sminfo_rcv_process_set_request: " "Responding to SM not master with zero sm_key\n" ); diff --git a/trunk/ulp/opensm/user/opensm/osm_state_mgr.c b/trunk/ulp/opensm/user/opensm/osm_state_mgr.c index e27247b7..e4590832 100644 --- a/trunk/ulp/opensm/user/opensm/osm_state_mgr.c +++ b/trunk/ulp/opensm/user/opensm/osm_state_mgr.c @@ -1643,7 +1643,7 @@ __osm_state_mgr_send_handover( p_smi->pri_state = ( uint8_t ) ( p_mgr->p_subn->sm_state | p_mgr->p_subn->opt.sm_priority << 4 ); /* - * Return 0 for the SM key unless we authenticate the requestor + * Return 0 for the SM key unless we authenticate the requester * as the master SM. */ if( ib_sminfo_get_state( &p_sm->smi ) == IB_SMINFO_STATE_MASTER ) @@ -1655,7 +1655,7 @@ __osm_state_mgr_send_handover( } else { - /* The requestor is not authenticated as master - set sm_key to zero */ + /* The requester is not authenticated as master - set sm_key to zero */ osm_log( p_mgr->p_log, OSM_LOG_DEBUG, "__osm_state_mgr_send_handover: " "Responding to SM not master with zero sm_key\n" ); @@ -2217,7 +2217,7 @@ osm_state_mgr_process( } } - /* Need to continue with lid assigning */ + /* Need to continue with lid assignment */ osm_drop_mgr_process( p_mgr->p_drop_mgr ); p_mgr->state = OSM_SM_STATE_SET_PKEY;