From owner-svn-src-head@FreeBSD.ORG  Sun Mar 15 20:15:11 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
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 515013DC;
 Sun, 15 Mar 2015 20:15:11 +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 3CF0ADE2;
 Sun, 15 Mar 2015 20:15:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2FKFBx2053595;
 Sun, 15 Mar 2015 20:15:11 GMT (envelope-from adrian@FreeBSD.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2FKFBan053594;
 Sun, 15 Mar 2015 20:15:11 GMT (envelope-from adrian@FreeBSD.org)
Message-Id: <201503152015.t2FKFBan053594@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, 15 Mar 2015 20:15:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r280055 - 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
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 15 Mar 2015 20:15:11 -0000

Author: adrian
Date: Sun Mar 15 20:15:10 2015
New Revision: 280055
URL: https://svnweb.freebsd.org/changeset/base/280055

Log:
  Fix races between wpi_rx_done() and wpi_stop()
  
  PR:		kern/197143
  Submitted by:	Andriy Voskoboinyk <s3erios@gmail.com>

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:13:58 2015	(r280054)
+++ head/sys/dev/wpi/if_wpi.c	Sun Mar 15 20:15:10 2015	(r280055)
@@ -1952,6 +1952,12 @@ wpi_notif_intr(struct wpi_softc *sc)
 		case WPI_RX_DONE:
 			/* An 802.11 frame has been received. */
 			wpi_rx_done(sc, desc, data);
+
+			if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) {
+				/* wpi_stop() was called. */
+				return;
+			}
+
 			break;
 
 		case WPI_TX_DONE: