From owner-svn-src-head@FreeBSD.ORG Sun Mar 15 20:19:02 2015 Return-Path: Delivered-To: svn-src-head@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 A3E28862; Sun, 15 Mar 2015 20:19:02 +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 8F56CE1E; Sun, 15 Mar 2015 20:19:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2FKJ2ta054246; Sun, 15 Mar 2015 20:19:02 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2FKJ2Dn054243; Sun, 15 Mar 2015 20:19:02 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201503152019.t2FKJ2Dn054243@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Sun, 15 Mar 2015 20:19:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r280058 - 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-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Mar 2015 20:19:02 -0000 Author: adrian Date: Sun Mar 15 20:19:01 2015 New Revision: 280058 URL: https://svnweb.freebsd.org/changeset/base/280058 Log: Check some variables only on active TX rings PR: kern/197143 Submitted by: Andriy Voskoboinyk Modified: head/sys/dev/wpi/if_wpi.c head/sys/dev/wpi/if_wpireg.h Modified: head/sys/dev/wpi/if_wpi.c ============================================================================== --- head/sys/dev/wpi/if_wpi.c Sun Mar 15 20:18:09 2015 (r280057) +++ head/sys/dev/wpi/if_wpi.c Sun Mar 15 20:19:01 2015 (r280058) @@ -2096,7 +2096,7 @@ wpi_wakeup_intr(struct wpi_softc *sc) sc->rxq.update = 0; wpi_update_rx_ring(sc); } - for (qid = 0; qid < WPI_NTXQUEUES; qid++) { + for (qid = 0; qid < WPI_DRV_NTXQUEUES; qid++) { struct wpi_tx_ring *ring = &sc->txq[qid]; if (ring->update) { @@ -2165,7 +2165,7 @@ wpi_fatal_intr(struct wpi_softc *sc) wpi_nic_unlock(sc); /* Dump driver status (TX and RX rings) while we're here. */ printf("driver status:\n"); - for (i = 0; i < WPI_NTXQUEUES; i++) { + for (i = 0; i < WPI_DRV_NTXQUEUES; i++) { struct wpi_tx_ring *ring = &sc->txq[i]; printf(" tx ring %2d: qid=%-2d cur=%-3d queued=%-3d\n", i, ring->qid, ring->cur, ring->queued); Modified: head/sys/dev/wpi/if_wpireg.h ============================================================================== --- head/sys/dev/wpi/if_wpireg.h Sun Mar 15 20:18:09 2015 (r280057) +++ head/sys/dev/wpi/if_wpireg.h Sun Mar 15 20:19:01 2015 (r280058) @@ -24,6 +24,7 @@ #define WPI_RX_RING_COUNT (1 << WPI_RX_RING_COUNT_LOG) #define WPI_NTXQUEUES 8 +#define WPI_DRV_NTXQUEUES 5 #define WPI_NDMACHNLS 6 /* Maximum scatter/gather. */