From owner-p4-projects@FreeBSD.ORG  Sat May 10 00:07:52 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 955141065672; Sat, 10 May 2008 00:07:52 +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 57DE71065670
	for <perforce@freebsd.org>; Sat, 10 May 2008 00:07:52 +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 468768FC16
	for <perforce@freebsd.org>; Sat, 10 May 2008 00:07:52 +0000 (UTC)
	(envelope-from thompsa@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 m4A07q4P054513
	for <perforce@freebsd.org>; Sat, 10 May 2008 00:07:52 GMT
	(envelope-from thompsa@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4A07qRU054511
	for perforce@freebsd.org; Sat, 10 May 2008 00:07:52 GMT
	(envelope-from thompsa@freebsd.org)
Date: Sat, 10 May 2008 00:07:52 GMT
Message-Id: <200805100007.m4A07qRU054511@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 141400 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: Sat, 10 May 2008 00:07:53 -0000

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

Change 141400 by thompsa@thompsa_burger on 2008/05/10 00:07:23

	Add a pause if the interface has been upped by our vap but the taskq
	hasnt completed yet. The NDIS OID commands will fail otherwise.

Affected files ...

.. //depot/projects/vap/sys/dev/if_ndis/if_ndis.c#24 edit

Differences ...

==== //depot/projects/vap/sys/dev/if_ndis/if_ndis.c#24 (text+ko) ====

@@ -2799,7 +2799,23 @@
 	struct ndis_oid_data	oid;
 	struct ndis_evt		evt;
 	void			*oidbuf;
-	int			error = 0;
+	int			n, error = 0;
+
+	switch(command) {
+	case SIOCGDRVSPEC:
+	case SIOCSDRVSPEC:
+		/*
+		 * The ndis commands get passed directly to us from
+		 * the vap, check if the vap has started us yet.
+		 */
+		n = 50;
+		while (n-- && (ifp->if_flags & IFF_UP) &&
+		    !(ifp->if_drv_flags & IFF_DRV_RUNNING))
+			pause("ndisioctl", hz/10);
+		/* Interface is not ready */
+		if (!NDIS_INITIALIZED(sc))
+			return (ENXIO);
+	}
 
 	switch(command) {
 	case SIOCSIFFLAGS: