From owner-p4-projects@FreeBSD.ORG  Tue Dec  2 18:07:00 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0944F1065677; Tue,  2 Dec 2008 18:07:00 +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 C02BB1065675
	for <perforce@freebsd.org>; Tue,  2 Dec 2008 18:06:59 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id AC8668FC1F
	for <perforce@freebsd.org>; Tue,  2 Dec 2008 18:06:59 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB2I6xUA093143
	for <perforce@freebsd.org>; Tue, 2 Dec 2008 18:06:59 GMT
	(envelope-from thompsa@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB2I6xHY093141
	for perforce@freebsd.org; Tue, 2 Dec 2008 18:06:59 GMT
	(envelope-from thompsa@freebsd.org)
Date: Tue, 2 Dec 2008 18:06:59 GMT
Message-Id: <200812021806.mB2I6xHY093141@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	thompsa@freebsd.org using -f
From: Andrew Thompson <thompsa@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 153962 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: Tue, 02 Dec 2008 18:07:00 -0000

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

Change 153962 by thompsa@thompsa_burger on 2008/12/02 18:06:24

	If the parent up/down task was queued then sync with it before
	returning from the vap ioctl. This means that the parent interface
	_should_ be up before we return to userland, it does not depend on the
	parent init succeeding, just that it was run.
	
	This fixes wpa_supplicant with ndis as it fires passthrough OID ioctls
	as soon as the vap is up yet the parent may still be down.

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#70 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#70 (text+ko) ====

@@ -42,6 +42,7 @@
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/systm.h>
+#include <sys/taskqueue.h>
  
 #include <net/if.h>
 #include <net/if_dl.h>
@@ -3213,6 +3214,8 @@
 			ieee80211_stop_locked(vap);
 		}
 		IEEE80211_UNLOCK(ic);
+		/* Wait for parent ioctl handler if it was queued */
+		taskqueue_drain(taskqueue_thread, &ic->ic_parent_task);
 		break;
 	case SIOCADDMULTI:
 	case SIOCDELMULTI: