Date: Sun, 11 Jan 2015 14:36:27 +0000 (UTC) From: Hans Petter Selasky <hselasky@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r276979 - stable/10/contrib/ofed/management/opensm/opensm Message-ID: <201501111436.t0BEaRDL059741@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hselasky Date: Sun Jan 11 14:36:26 2015 New Revision: 276979 URL: https://svnweb.freebsd.org/changeset/base/276979 Log: MFC r276815: Fix for compilation issue. Don't use the "abs()" function for unsigned computations. PR: 196597 Sponsored by: Mellanox Technologies Modified: stable/10/contrib/ofed/management/opensm/opensm/osm_ucast_ftree.c Directory Properties: stable/10/ (props changed) Modified: stable/10/contrib/ofed/management/opensm/opensm/osm_ucast_ftree.c ============================================================================== --- stable/10/contrib/ofed/management/opensm/opensm/osm_ucast_ftree.c Sun Jan 11 14:33:16 2015 (r276978) +++ stable/10/contrib/ofed/management/opensm/opensm/osm_ucast_ftree.c Sun Jan 11 14:36:26 2015 (r276979) @@ -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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501111436.t0BEaRDL059741>