From owner-svn-src-all@FreeBSD.ORG  Thu Jan  8 10:13:57 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8B9E8C8B;
 Thu,  8 Jan 2015 10:13:57 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 76F9499B;
 Thu,  8 Jan 2015 10:13:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t08ADvWx083612;
 Thu, 8 Jan 2015 10:13:57 GMT (envelope-from hselasky@FreeBSD.org)
Received: (from hselasky@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t08ADvB6083611;
 Thu, 8 Jan 2015 10:13:57 GMT (envelope-from hselasky@FreeBSD.org)
Message-Id: <201501081013.t08ADvB6083611@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: hselasky set sender to
 hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Thu, 8 Jan 2015 10:13:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r276815 - head/contrib/ofed/management/opensm/opensm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jan 2015 10:13:57 -0000

Author: hselasky
Date: Thu Jan  8 10:13:56 2015
New Revision: 276815
URL: https://svnweb.freebsd.org/changeset/base/276815

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

Modified:
  head/contrib/ofed/management/opensm/opensm/osm_ucast_ftree.c

Modified: head/contrib/ofed/management/opensm/opensm/osm_ucast_ftree.c
==============================================================================
--- head/contrib/ofed/management/opensm/opensm/osm_ucast_ftree.c	Thu Jan  8 07:47:39 2015	(r276814)
+++ head/contrib/ofed/management/opensm/opensm/osm_ucast_ftree.c	Thu Jan  8 10:13:56 2015	(r276815)
@@ -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"