From owner-svn-src-head@FreeBSD.ORG Sun Mar 15 21:08:25 2015 Return-Path: Delivered-To: svn-src-head@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 BB5C8942; Sun, 15 Mar 2015 21:08:25 +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 8D483765; Sun, 15 Mar 2015 21:08:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2FL8P3u080542; Sun, 15 Mar 2015 21:08:25 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2FL8PEs080541; Sun, 15 Mar 2015 21:08:25 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201503152108.t2FL8PEs080541@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 21:08:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r280097 - 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 21:08:25 -0000 Author: adrian Date: Sun Mar 15 21:08:24 2015 New Revision: 280097 URL: https://svnweb.freebsd.org/changeset/base/280097 Log: Acquire ifq lock when checking / modifying IFF_DRV_OACTIVE flag. 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 21:07:43 2015 (r280096) +++ head/sys/dev/wpi/if_wpi.c Sun Mar 15 21:08:24 2015 (r280097) @@ -1967,11 +1967,14 @@ wpi_tx_done(struct wpi_softc *sc, struct sc->sc_tx_timer = 0; if (--ring->queued < WPI_TX_RING_LOMARK) { sc->qfullmsk &= ~(1 << ring->qid); + IF_LOCK(&ifp->if_snd); if (sc->qfullmsk == 0 && (ifp->if_drv_flags & IFF_DRV_OACTIVE)) { ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; + IF_UNLOCK(&ifp->if_snd); ieee80211_runtask(ic, &sc->sc_start_task); - } + } else + IF_UNLOCK(&ifp->if_snd); } DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_END, __func__); @@ -2871,13 +2874,19 @@ wpi_start_locked(struct ifnet *ifp) DPRINTF(sc, WPI_DEBUG_XMIT, "%s: called\n", __func__); + IF_LOCK(&ifp->if_snd); if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0 || - (ifp->if_drv_flags & IFF_DRV_OACTIVE)) + (ifp->if_drv_flags & IFF_DRV_OACTIVE)) { + IF_UNLOCK(&ifp->if_snd); return; + } + IF_UNLOCK(&ifp->if_snd); for (;;) { if (sc->qfullmsk != 0) { + IF_LOCK(&ifp->if_snd); ifp->if_drv_flags |= IFF_DRV_OACTIVE; + IF_UNLOCK(&ifp->if_snd); break; } IFQ_DRV_DEQUEUE(&ifp->if_snd, m); @@ -5222,8 +5231,10 @@ wpi_init(void *arg) goto fail; } + IF_LOCK(&ifp->if_snd); ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; ifp->if_drv_flags |= IFF_DRV_RUNNING; + IF_UNLOCK(&ifp->if_snd); callout_reset(&sc->watchdog_to, hz, wpi_watchdog, sc); @@ -5255,7 +5266,10 @@ wpi_stop_locked(struct wpi_softc *sc) sc->sc_tx_timer = 0; callout_stop(&sc->watchdog_to); callout_stop(&sc->calib_to); + + IF_LOCK(&ifp->if_snd); ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE); + IF_UNLOCK(&ifp->if_snd); /* Power OFF hardware. */ wpi_hw_stop(sc);