From owner-svn-src-all@FreeBSD.ORG  Sun May  3 23:37:14 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BD8062DF;
 Sun,  3 May 2015 23:37:14 +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 9EB941A5F;
 Sun,  3 May 2015 23:37:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t43NbEnl095490;
 Sun, 3 May 2015 23:37:14 GMT (envelope-from adrian@FreeBSD.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t43NbE60095487;
 Sun, 3 May 2015 23:37:14 GMT (envelope-from adrian@FreeBSD.org)
Message-Id: <201505032337.t43NbE60095487@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: adrian set sender to
 adrian@FreeBSD.org using -f
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sun, 3 May 2015 23:37:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r282398 - head/sys/dev/wpi
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.20
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: Sun, 03 May 2015 23:37:14 -0000

Author: adrian
Date: Sun May  3 23:37:13 2015
New Revision: 282398
URL: https://svnweb.freebsd.org/changeset/base/282398

Log:
  Fix warning about comparison of integers of different signs.
  
  PR:		kern/197143
  Submitted by:	Andriy Voskoboinyk <s3erios@gmail.com>

Modified:
  head/sys/dev/wpi/if_wpi.c
  head/sys/dev/wpi/if_wpi_debug.h

Modified: head/sys/dev/wpi/if_wpi.c
==============================================================================
--- head/sys/dev/wpi/if_wpi.c	Sun May  3 23:36:25 2015	(r282397)
+++ head/sys/dev/wpi/if_wpi.c	Sun May  3 23:37:13 2015	(r282398)
@@ -2080,7 +2080,7 @@ wpi_notif_intr(struct wpi_softc *sc)
 	bus_dmamap_sync(sc->shared_dma.tag, sc->shared_dma.map,
 	    BUS_DMASYNC_POSTREAD);
 
-	hw = le32toh(sc->shared->next);
+	hw = le32toh(sc->shared->next) & 0xfff;
 	hw = (hw == 0) ? WPI_RX_RING_COUNT - 1 : hw - 1;
 
 	while (sc->rxq.cur != hw) {
@@ -2305,7 +2305,7 @@ wpi_wakeup_intr(struct wpi_softc *sc)
 static void
 wpi_debug_registers(struct wpi_softc *sc)
 {
-	int i;
+	size_t i;
 	static const uint32_t csr_tbl[] = {
 		WPI_HW_IF_CONFIG,
 		WPI_INT,

Modified: head/sys/dev/wpi/if_wpi_debug.h
==============================================================================
--- head/sys/dev/wpi/if_wpi_debug.h	Sun May  3 23:36:25 2015	(r282397)
+++ head/sys/dev/wpi/if_wpi_debug.h	Sun May  3 23:37:13 2015	(r282398)
@@ -99,7 +99,7 @@ static const char *wpi_cmd_str(int cmd)
 /*
  * Translate CSR code to string
  */
-static const char *wpi_get_csr_string(int csr)
+static const char *wpi_get_csr_string(size_t csr)
 {
 	switch (csr) {
 		WPI_DESC(WPI_HW_IF_CONFIG);
@@ -123,7 +123,7 @@ static const char *wpi_get_csr_string(in
 	}
 }
 
-static const char *wpi_get_prph_string(int prph)
+static const char *wpi_get_prph_string(size_t prph)
 {
 	switch (prph) {
 		WPI_DESC(WPI_APMG_CLK_CTRL);