svn commit: r276978 - stable/9/contrib/ofed/management/opensm/opensm

Hans Petter Selasky hselasky at FreeBSD.org
Sun Jan 11 14:33:17 UTC 2015


Author: hselasky
Date: Sun Jan 11 14:33:16 2015
New Revision: 276978
URL: https://svnweb.freebsd.org/changeset/base/276978

Log:
  MFC r276815:
  Fix for compilation issue. Don't use the "abs()" function for unsigned
  computations.
  
  PR:		196597
  Sponsored by:	Mellanox Technologies

Modified:
  stable/9/contrib/ofed/management/opensm/opensm/osm_ucast_ftree.c
Directory Properties:
  stable/9/contrib/   (props changed)

Modified: stable/9/contrib/ofed/management/opensm/opensm/osm_ucast_ftree.c
==============================================================================
--- stable/9/contrib/ofed/management/opensm/opensm/osm_ucast_ftree.c	Sun Jan 11 14:30:50 2015	(r276977)
+++ stable/9/contrib/ofed/management/opensm/opensm/osm_ucast_ftree.c	Sun Jan 11 14:33:16 2015	(r276978)
@@ -2917,6 +2917,10 @@ Exit:
 
 /***************************************************
  ***************************************************/
+static boolean_t __osm_invalid_link_rank_diff(const uint32_t val)
+{
+	return (val != 1U && val != -1U);
+}
 
 static int __osm_ftree_fabric_construct_sw_ports(IN ftree_fabric_t * p_ftree,
 						 IN ftree_sw_t * p_sw)
@@ -2993,7 +2997,7 @@ static int __osm_ftree_fabric_construct_
 
 			p_remote_hca_or_sw = (void *)p_remote_sw;
 
-			if (abs(p_sw->rank - p_remote_sw->rank) != 1) {
+			if (__osm_invalid_link_rank_diff(p_sw->rank - p_remote_sw->rank)) {
 				OSM_LOG(&p_ftree->p_osm->log, OSM_LOG_ERROR,
 					"ERR AB16: "
 					"Illegal link between switches with ranks %u and %u:\n"


More information about the svn-src-stable mailing list