From owner-svn-src-head@freebsd.org  Sun Sep 27 12:19:37 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id AA69FA0AE17;
 Sun, 27 Sep 2015 12:19:37 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 9B28F62F;
 Sun, 27 Sep 2015 12:19:37 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8RCJbIJ063405;
 Sun, 27 Sep 2015 12:19:37 GMT (envelope-from bz@FreeBSD.org)
Received: (from bz@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8RCJb1m063403;
 Sun, 27 Sep 2015 12:19:37 GMT (envelope-from bz@FreeBSD.org)
Message-Id: <201509271219.t8RCJb1m063403@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org
 using -f
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sun, 27 Sep 2015 12:19:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r288308 - head/sys/dev/nxge/xgehal
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 27 Sep 2015 12:19:37 -0000

Author: bz
Date: Sun Sep 27 12:19:36 2015
New Revision: 288308
URL: https://svnweb.freebsd.org/changeset/base/288308

Log:
  Fix what looks like a consistent copy&paste error.
  Don't make an integer to a boolean and then compare to a value which
  needs an integer comparison.
  
  Spotted by:	reading kernel compile time log
  MFC after:	2 weeks

Modified:
  head/sys/dev/nxge/xgehal/xgehal-fifo.c
  head/sys/dev/nxge/xgehal/xgehal-ring.c

Modified: head/sys/dev/nxge/xgehal/xgehal-fifo.c
==============================================================================
--- head/sys/dev/nxge/xgehal/xgehal-fifo.c	Sun Sep 27 12:17:03 2015	(r288307)
+++ head/sys/dev/nxge/xgehal/xgehal-fifo.c	Sun Sep 27 12:19:36 2015	(r288308)
@@ -464,7 +464,7 @@ __hal_fifo_hw_initialize(xge_hal_device_
 
 	    if (!hldev->config.fifo.queue[i].configured ||
 	        !hldev->config.fifo.queue[i].intr_vector ||
-	        !hldev->config.intr_mode != XGE_HAL_INTR_MODE_MSIX)
+	        hldev->config.intr_mode != XGE_HAL_INTR_MODE_MSIX)
 	        continue;
 
 	    /* find channel */

Modified: head/sys/dev/nxge/xgehal/xgehal-ring.c
==============================================================================
--- head/sys/dev/nxge/xgehal/xgehal-ring.c	Sun Sep 27 12:17:03 2015	(r288307)
+++ head/sys/dev/nxge/xgehal/xgehal-ring.c	Sun Sep 27 12:19:36 2015	(r288308)
@@ -609,7 +609,7 @@ __hal_ring_hw_initialize(xge_hal_device_
 
 	    if (!hldev->config.ring.queue[i].configured ||
 	        !hldev->config.ring.queue[i].intr_vector ||
-	        !hldev->config.intr_mode != XGE_HAL_INTR_MODE_MSIX)
+	        hldev->config.intr_mode != XGE_HAL_INTR_MODE_MSIX)
 	        continue;
 
 	    /* find channel */