From owner-p4-projects@FreeBSD.ORG  Thu Apr  3 17:44:53 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 987A91065672; Thu,  3 Apr 2008 17:44:53 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5A898106566C
	for <perforce@freebsd.org>; Thu,  3 Apr 2008 17:44:53 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 459DB8FC1B
	for <perforce@freebsd.org>; Thu,  3 Apr 2008 17:44:53 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m33Hirnf097949
	for <perforce@freebsd.org>; Thu, 3 Apr 2008 17:44:53 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m33HirrD097947
	for perforce@freebsd.org; Thu, 3 Apr 2008 17:44:53 GMT
	(envelope-from sam@freebsd.org)
Date: Thu, 3 Apr 2008 17:44:53 GMT
Message-Id: <200804031744.m33HirrD097947@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 139279 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 03 Apr 2008 17:44:53 -0000

http://perforce.freebsd.org/chv.cgi?CH=139279

Change 139279 by sam@sam_ebb on 2008/04/03 17:44:13

	mark the vap OACTIVE under the com lock to close a race against
	the state machine

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_output.c#46 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_output.c#46 (text+ko) ====

@@ -125,12 +125,18 @@
 	 * for CSA).
 	 */
 	if (vap->iv_state != IEEE80211_S_RUN) {
-		IEEE80211_DPRINTF(vap, IEEE80211_MSG_OUTPUT,
-		    "%s: ignore queue, in %s state\n",
-		    __func__, ieee80211_state_name[vap->iv_state]);
-		vap->iv_stats.is_tx_badstate++;
-		ifp->if_drv_flags |= IFF_DRV_OACTIVE;
-		return;
+		IEEE80211_LOCK(ic);
+		/* re-check under the com lock to avoid races */
+		if (vap->iv_state != IEEE80211_S_RUN) {
+			IEEE80211_DPRINTF(vap, IEEE80211_MSG_OUTPUT,
+			    "%s: ignore queue, in %s state\n",
+			    __func__, ieee80211_state_name[vap->iv_state]);
+			vap->iv_stats.is_tx_badstate++;
+			ifp->if_drv_flags |= IFF_DRV_OACTIVE;
+			IEEE80211_UNLOCK(ic);
+			return;
+		}
+		IEEE80211_UNLOCK(ic);
 	}
 	for (;;) {
 		IFQ_DEQUEUE(&ifp->if_snd, m);