From owner-svn-src-head@FreeBSD.ORG Sun Mar 15 21:17:59 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 0A9CD3D7; Sun, 15 Mar 2015 21:17:59 +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 EA9DC893; Sun, 15 Mar 2015 21:17:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2FLHwIS085642; Sun, 15 Mar 2015 21:17:58 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2FLHwIg085641; Sun, 15 Mar 2015 21:17:58 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201503152117.t2FLHwIg085641@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:17:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r280104 - 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:17:59 -0000 Author: adrian Date: Sun Mar 15 21:17:58 2015 New Revision: 280104 URL: https://svnweb.freebsd.org/changeset/base/280104 Log: Merge wpi_start() and wpi_start_locked(). 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:17:03 2015 (r280103) +++ head/sys/dev/wpi/if_wpi.c Sun Mar 15 21:17:58 2015 (r280104) @@ -198,7 +198,6 @@ static int wpi_tx_data_raw(struct wpi_so static int wpi_raw_xmit(struct ieee80211_node *, struct mbuf *, const struct ieee80211_bpf_params *); static void wpi_start(struct ifnet *); -static void wpi_start_locked(struct ifnet *); static void wpi_start_task(void *, int); static void wpi_watchdog_rfkill(void *); static void wpi_watchdog(void *); @@ -2860,21 +2859,9 @@ static void wpi_start(struct ifnet *ifp) { struct wpi_softc *sc = ifp->if_softc; - - WPI_LOCK(sc); - wpi_start_locked(ifp); - WPI_UNLOCK(sc); -} - -static void -wpi_start_locked(struct ifnet *ifp) -{ - struct wpi_softc *sc = ifp->if_softc; struct ieee80211_node *ni; struct mbuf *m; - WPI_LOCK_ASSERT(sc); - DPRINTF(sc, WPI_DEBUG_XMIT, "%s: called\n", __func__); IF_LOCK(&ifp->if_snd); @@ -2885,6 +2872,7 @@ wpi_start_locked(struct ifnet *ifp) } IF_UNLOCK(&ifp->if_snd); + WPI_LOCK(sc); for (;;) { if (sc->qfullmsk != 0) { IF_LOCK(&ifp->if_snd); @@ -2903,6 +2891,7 @@ wpi_start_locked(struct ifnet *ifp) if_inc_counter(ifp, IFCOUNTER_OERRORS, 1); } } + WPI_UNLOCK(sc); DPRINTF(sc, WPI_DEBUG_XMIT, "%s: done\n", __func__); }