@@ -646,22 +646,22 @@ osm_port_t *osm_get_port_by_guid(IN osm_subn_t const *p_subn, IN ib_net64_t guid
osm_port_t *osm_get_port_by_lid(IN osm_subn_t const * subn, IN ib_net16_t lid)
{
osm_port_t *port = NULL;
- ib_api_status_t stat;
uint16_t base_lid;
uint8_t lmc;
lid = cl_ntoh16(lid);
+ if (lid >= cl_ptr_vector_get_size(&subn->port_lid_tbl))
+ return NULL;
/* Loop on lmc from 0 up through max LMC possible */
for (lmc = 0; lmc <= IB_PORT_LMC_MAX; lmc++) {
/* Calculate a base LID assuming this is the real LMC */
base_lid = lid & ~((1 << lmc) - 1);
- stat = cl_ptr_vector_at(&subn->port_lid_tbl, base_lid,
- (void *)&port);
+ port = cl_ptr_vector_get(&subn->port_lid_tbl, base_lid);
/* Determine if base LID "tested" is the real base LID */
/* This is true if the LMC "tested" is the port's actual LMC */
- if (stat == CL_SUCCESS && port && lmc == osm_port_get_lmc(port))
+ if (port && lmc == osm_port_get_lmc(port))
return port;
}
Use faster cl_ptr_vector_get() call instead of cl_ptr_vector_at(). In this way eliminate 'stat' variable needs. Signed-off-by: Sasha Khapyorsky <sashak@voltaire.com> --- opensm/opensm/osm_subnet.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)