From 6401578aff1fc969721f2a5acbb6ec22f20169ff Mon Sep 17 00:00:00 2001 From: eitan Date: Sun, 12 Mar 2006 13:23:35 +0000 Subject: [PATCH] [OpenSM] - cosmetic changes. git-svn-id: svn://openib.tc.cornell.edu/gen1@240 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86 --- trunk/ulp/opensm/user/libopensm/osm_helper.c | 1 + .../user/opensm/osm_sa_class_port_info.c | 8 ++--- .../opensm/user/opensm/osm_sa_path_record.c | 2 +- .../opensm/user/opensm/osm_sa_vlarb_record.c | 2 +- .../ulp/opensm/user/osmtest/osmt_multicast.c | 30 +++++++++---------- 5 files changed, 22 insertions(+), 21 deletions(-) diff --git a/trunk/ulp/opensm/user/libopensm/osm_helper.c b/trunk/ulp/opensm/user/libopensm/osm_helper.c index 40bbcd3b..d77d7049 100644 --- a/trunk/ulp/opensm/user/libopensm/osm_helper.c +++ b/trunk/ulp/opensm/user/libopensm/osm_helper.c @@ -1111,6 +1111,7 @@ osm_dump_inform_info( { uint32_t qpn; uint8_t resp_time_val; + ib_inform_info_get_qpn_resp_time(p_ii->g_or_v.generic.qpn_resp_time_val, &qpn,&resp_time_val); diff --git a/trunk/ulp/opensm/user/opensm/osm_sa_class_port_info.c b/trunk/ulp/opensm/user/opensm/osm_sa_class_port_info.c index 85bfca89..a1a23c71 100644 --- a/trunk/ulp/opensm/user/opensm/osm_sa_class_port_info.c +++ b/trunk/ulp/opensm/user/opensm/osm_sa_class_port_info.c @@ -174,12 +174,12 @@ __osm_cpi_rcv_respond( /* we do not support the optionals: OSM_CAP_IS_SUBN_OPT_RECS_SUP : SwitchInfoRecord, - LinearForwardingTableRecord, (we do support it - under the table) + LinearForwardingTableRecord, (we do support it under the table) RandomForwardingTableRecord, MulticastForwardingTableRecord, - SMInfoRecord, (we do support it - under the table) + SMInfoRecord, (we do support it under the table) InformInfoRecord, - LinkRecord, (we do support it - under the table) + LinkRecord, (we do support it under the table) ServiceAssociationRecord OSM_CAP_IS_SUBN_OPT_MULTI_PATH_SUP: @@ -187,7 +187,7 @@ __osm_cpi_rcv_respond( TraceRecord OSM_CAP_IS_SUBN_OPT_REINIT_SUP: - For re-initialization functionality. + For reinitialization functionality. So not sending traps, but supporting Get(Notice) and Set(Notice): */ 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 2d11b844..9a4f5b23 100644 --- a/trunk/ulp/opensm/user/opensm/osm_sa_path_record.c +++ b/trunk/ulp/opensm/user/opensm/osm_sa_path_record.c @@ -745,7 +745,7 @@ __osm_pr_rcv_get_port_pair_paths( osm_port_share_pkey(p_rcv->p_log, p_req_port, p_dest_port) == FALSE || osm_port_share_pkey(p_rcv->p_log, p_src_port, p_dest_port) == FALSE ) { - /* One of the pairs don't share a pkey - the path is disqualified. + /* One of the pairs doesn't share a pkey so the path is disqualified. Exit */ 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 1015924e..17aa03ae 100644 --- a/trunk/ulp/opensm/user/opensm/osm_sa_vlarb_record.c +++ b/trunk/ulp/opensm/user/opensm/osm_sa_vlarb_record.c @@ -267,7 +267,7 @@ __osm_sa_vl_arb_by_comp_mask( { p_physp = osm_port_get_phys_ptr( p_port, port_num ); /* check that the p_physp is valid, and that the requestor - and the p_phsyp share a pkey. */ + 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) ) __osm_sa_vl_arb_check_physp( p_rcv, p_physp, p_ctxt ); diff --git a/trunk/ulp/opensm/user/osmtest/osmt_multicast.c b/trunk/ulp/opensm/user/osmtest/osmt_multicast.c index 0ef59e12..1f91302f 100644 --- a/trunk/ulp/opensm/user/osmtest/osmt_multicast.c +++ b/trunk/ulp/opensm/user/osmtest/osmt_multicast.c @@ -1454,7 +1454,7 @@ osmt_run_mcast_flow( IN osmtest_t * const p_osmt ) { { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmt_run_mcast_flow: ERR 02ak: " - "Failed to create MGC for MGID=0 with higher than minimum RATE\n", + "Failed to create MCG for MGID=0 with higher than minimum RATE\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) ); @@ -1499,7 +1499,7 @@ osmt_run_mcast_flow( IN osmtest_t * const p_osmt ) { { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmt_run_mcast_flow: ERR 021: " - "Failed to create MGC for MGID=0 with less than highest RATE\n", + "Failed to create MCG for MGID=0 with less than highest RATE\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) ); @@ -1544,7 +1544,7 @@ osmt_run_mcast_flow( IN osmtest_t * const p_osmt ) { { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmt_run_mcast_flow: ERR 0238: " - "Failed to create MGC for MGID=0 with less than highest MTU\n", + "Failed to create MCG for MGID=0 with less than highest MTU\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) ); @@ -1587,7 +1587,7 @@ osmt_run_mcast_flow( IN osmtest_t * const p_osmt ) { { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmt_run_mcast_flow: ERR 0239: " - "Failed to create MGC for MGID=0 with higher than lowest MTU\n", + "Failed to create MCG for MGID=0 with higher than lowest MTU\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) ); @@ -1635,7 +1635,7 @@ osmt_run_mcast_flow( IN osmtest_t * const p_osmt ) { { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmt_run_mcast_flow: ERR 0240: " - "Failed to create MGC for MGID=0 with exact MTU & RATE\n", + "Failed to create MCG for MGID=0 with exact MTU & RATE\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) ); @@ -1679,7 +1679,7 @@ osmt_run_mcast_flow( IN osmtest_t * const p_osmt ) { { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmt_run_mcast_flow: ERR 0241: " - "Failed to create MGC for MGID=0 with exact RATE\n", + "Failed to create MCG for MGID=0 with exact RATE\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) ); @@ -1723,7 +1723,7 @@ osmt_run_mcast_flow( IN osmtest_t * const p_osmt ) { { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmt_run_mcast_flow: ERR 0242: " - "Failed to create MGC for MGID=0 with exact MTU\n", + "Failed to create MCG for MGID=0 with exact MTU\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) ); @@ -1804,7 +1804,7 @@ osmt_run_mcast_flow( IN osmtest_t * const p_osmt ) { { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmt_run_mcast_flow: ERR 0210: " - "Failed to create MGC for MGID=0\n", + "Failed to create MCG for MGID=0\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) ); @@ -1842,7 +1842,7 @@ osmt_run_mcast_flow( IN osmtest_t * const p_osmt ) { { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmt_run_mcast_flow: ERR 0211: " - "Failed to create MGC for MGID=0x%016" PRIx64 " : " + "Failed to create MCG for MGID=0x%016" PRIx64 " : " "0x%016" PRIx64 " (o15.0.1.6)...\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad)), @@ -2007,7 +2007,7 @@ osmt_run_mcast_flow( IN osmtest_t * const p_osmt ) { { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmt_run_mcast_flow: ERR 0216: " - "Failed to create MGC for MGID=0x%016" PRIx64 " : " + "Failed to create MCG for MGID=0x%016" PRIx64 " : " "0x%016" PRIx64 "\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ), @@ -2083,7 +2083,7 @@ osmt_run_mcast_flow( IN osmtest_t * const p_osmt ) { { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmt_run_mcast_flow: ERR 0218: " - "Failed to create MGC for MGID=0xFF02:0:0:0:0:0:0:1\n", + "Failed to create MCG for MGID=0xFF02:0:0:0:0:0:0:1\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) ); @@ -2159,7 +2159,7 @@ osmt_run_mcast_flow( IN osmtest_t * const p_osmt ) { { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmt_run_mcast_flow: ERR 0220: " - "Failed to create MGC with valid join state 0x3\n", + "Failed to create MCG with valid join state 0x3\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) ); @@ -2222,7 +2222,7 @@ osmt_run_mcast_flow( IN osmtest_t * const p_osmt ) { { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmt_run_mcast_flow: ERR 0222: " - "Failed to create MGC with valid join state 0xF\n", + "Failed to create MCG with valid join state 0xF\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ) ); @@ -2265,7 +2265,7 @@ osmt_run_mcast_flow( IN osmtest_t * const p_osmt ) { { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmt_run_mcast_flow: ERR 02cc: " - "Failed to join MGC with valid req, returned status = %s\n", + "Failed to join MCG with valid req, returned status = %s\n", ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) )); goto Exit; } @@ -2791,7 +2791,7 @@ osmt_run_mcast_flow( IN osmtest_t * const p_osmt ) { { osm_log( &p_osmt->log, OSM_LOG_ERROR, "osmt_run_mcast_flow: ERR 02cv: " - "Failed to create MGC for 0x%016" PRIx64 " : " + "Failed to create MCG for 0x%016" PRIx64 " : " "0x%016" PRIx64 ".\n", ib_get_err_str( status ), ib_get_mad_status_str( (ib_mad_t*)(&res_sa_mad) ), -- 2.41.0