From owner-p4-projects@FreeBSD.ORG  Tue Jan  2 03:30:32 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7132016A40F; Tue,  2 Jan 2007 03:30:32 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 4581516A403
	for <perforce@freebsd.org>; Tue,  2 Jan 2007 03:30:32 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 36F9513C467
	for <perforce@freebsd.org>; Tue,  2 Jan 2007 03:30:32 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l023UWDu080340
	for <perforce@freebsd.org>; Tue, 2 Jan 2007 03:30:32 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l023UVUR080337
	for perforce@freebsd.org; Tue, 2 Jan 2007 03:30:31 GMT
	(envelope-from kmacy@freebsd.org)
Date: Tue, 2 Jan 2007 03:30:31 GMT
Message-Id: <200701020330.l023UVUR080337@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 112410 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 Jan 2007 03:30:32 -0000

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

Change 112410 by kmacy@kmacy_serendipity:sam_wifi on 2007/01/02 03:30:17

	fix read / write of the MAC register errors mentioned in the previous
	commit by serializing the task queue functions with respect to each 
	other 
	(this commit is happening over ural)

Affected files ...

.. //depot/projects/wifi/sys/dev/usb/if_ural.c#13 edit

Differences ...

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

@@ -737,6 +737,7 @@
 
 	ostate = ic->ic_state;
 
+	RAL_LOCK(sc);
 	switch (sc->sc_state) {
 	case IEEE80211_S_INIT:
 		if (ostate == IEEE80211_S_RUN) {
@@ -791,6 +792,7 @@
 		break;
 	}
 
+	RAL_UNLOCK(sc);
 	sc->sc_newstate(ic, sc->sc_state, -1);
 }
 
@@ -801,6 +803,7 @@
 	struct ieee80211com *ic = &sc->sc_ic;
 	struct ifnet *ifp = ic->ic_ifp;
 
+	RAL_LOCK(sc);
 	if (sc->sc_scan_action == URAL_SCAN_START) {
 		/* abort TSF synchronization */
 		ural_write(sc, RAL_TXRX_CSR19, 0);
@@ -814,6 +817,7 @@
 		/* XXX keep local copy */
 		ural_set_bssid(sc, ic->ic_bss->ni_bssid);
 	} 
+	RAL_UNLOCK(sc);
 }
 
 static int