From owner-p4-projects@FreeBSD.ORG  Wed Jan 16 19:51:41 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7B76F16A420; Wed, 16 Jan 2008 19:51:41 +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 40E9316A418
	for <perforce@freebsd.org>; Wed, 16 Jan 2008 19:51:41 +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 3010E13C455
	for <perforce@freebsd.org>; Wed, 16 Jan 2008 19:51:41 +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 m0GJpf3I008868
	for <perforce@freebsd.org>; Wed, 16 Jan 2008 19:51:41 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0GJpfQN008865
	for perforce@freebsd.org; Wed, 16 Jan 2008 19:51:41 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 16 Jan 2008 19:51:41 GMT
Message-Id: <200801161951.m0GJpfQN008865@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 133429 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: Wed, 16 Jan 2008 19:51:41 -0000

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

Change 133429 by sam@sam_ebb on 2008/01/16 19:51:10

	bandaid locking so scanning completes; this is a total hack
	in lieu of overhauling the net80211 state machine to deal
	with drivers that operate asynchronously

Affected files ...

.. //depot/projects/vap/sys/dev/usb/if_ural.c#7 edit
.. //depot/projects/vap/sys/dev/usb/if_zyd.c#7 edit

Differences ...

==== //depot/projects/vap/sys/dev/usb/if_ural.c#7 (text+ko) ====

@@ -805,7 +805,9 @@
 
 	RAL_UNLOCK(sc);
 
+	IEEE80211_LOCK(ic);	/*XXX*/
 	uvp->newstate(vap, sc->sc_state, sc->sc_arg);
+	IEEE80211_UNLOCK(ic);
 }
 
 static void

==== //depot/projects/vap/sys/dev/usb/if_zyd.c#7 (text+ko) ====

@@ -750,7 +750,9 @@
 		break;
 	}
 
+	IEEE80211_LOCK(ic);	/*XXX*/
 	zvp->newstate(vap, sc->sc_state, sc->sc_arg);
+	IEEE80211_UNLOCK(ic);
 }
 
 static int