From owner-svn-src-all@FreeBSD.ORG Sun Mar 15 20:43:23 2015 Return-Path: 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 1CC4C3E8; Sun, 15 Mar 2015 20:43:23 +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 088D11A9; Sun, 15 Mar 2015 20:43:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2FKhMdX068949; Sun, 15 Mar 2015 20:43:22 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2FKhM2I068948; Sun, 15 Mar 2015 20:43:22 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201503152043.t2FKhM2I068948@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:43:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r280075 - 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.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Mar 2015 20:43:23 -0000 Author: adrian Date: Sun Mar 15 20:43:22 2015 New Revision: 280075 URL: https://svnweb.freebsd.org/changeset/base/280075 Log: Use ring->queued for WPI_CMD_TX_DATA only. PR: kern/197143 Submitted by: Andriy Voskoboinyk Modified: head/sys/dev/wpi/if_wpi.c Modified: head/sys/dev/wpi/if_wpi.c ============================================================================== --- head/sys/dev/wpi/if_wpi.c Sun Mar 15 20:42:41 2015 (r280074) +++ head/sys/dev/wpi/if_wpi.c Sun Mar 15 20:43:22 2015 (r280075) @@ -1965,6 +1965,8 @@ wpi_cmd_done(struct wpi_softc *sc, struc if ((desc->qid & WPI_RX_DESC_QID_MSK) != WPI_CMD_QUEUE_NUM) return; /* Not a command ack. */ + KASSERT(ring->queued == 0, ("ring->queued must be 0")); + data = &ring->data[desc->idx]; /* If the command was mapped in an mbuf, free it. */ @@ -2404,12 +2406,13 @@ wpi_cmd2(struct wpi_softc *sc, struct wp ring->cur = (ring->cur + 1) % WPI_TX_RING_COUNT; wpi_update_tx_ring(sc, ring); - /* Mark TX ring as full if we reach a certain threshold. */ - if (++ring->queued > WPI_TX_RING_HIMARK) - sc->qfullmsk |= 1 << ring->qid; + if (ring->qid < WPI_CMD_QUEUE_NUM) { + /* Mark TX ring as full if we reach a certain threshold. */ + if (++ring->queued > WPI_TX_RING_HIMARK) + sc->qfullmsk |= 1 << ring->qid; - if (ring->qid < WPI_CMD_QUEUE_NUM) sc->sc_tx_timer = 5; + } DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_END, __func__);