From owner-p4-projects@FreeBSD.ORG  Tue Jan 15 23:30:30 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8421616A468; Tue, 15 Jan 2008 23:30:30 +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 2C40416A419
	for <perforce@freebsd.org>; Tue, 15 Jan 2008 23:30:30 +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 1691613C46B
	for <perforce@freebsd.org>; Tue, 15 Jan 2008 23:30:28 +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 m0FNUSHF098537
	for <perforce@freebsd.org>; Tue, 15 Jan 2008 23:30:28 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0FNUSSR098531
	for perforce@freebsd.org; Tue, 15 Jan 2008 23:30:28 GMT
	(envelope-from sam@freebsd.org)
Date: Tue, 15 Jan 2008 23:30:28 GMT
Message-Id: <200801152330.m0FNUSSR098531@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 133369 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, 15 Jan 2008 23:30:30 -0000

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

Change 133369 by sam@sam_ebb on 2008/01/15 23:30:17

	must hold mtx over callout_stop when callout setup with init_mtx

Affected files ...

.. //depot/projects/vap/sys/dev/ral/rt2560.c#6 edit
.. //depot/projects/vap/sys/dev/ral/rt2661.c#6 edit

Differences ...

==== //depot/projects/vap/sys/dev/ral/rt2560.c#6 (text) ====

@@ -348,6 +348,7 @@
 	struct ifnet *ifp = ic->ic_ifp;
 	
 	rt2560_stop(sc);
+	RAL_LOCK(sc);
 	callout_stop(&sc->watchdog_ch);
 	callout_stop(&sc->rssadapt_ch);
 

==== //depot/projects/vap/sys/dev/ral/rt2661.c#6 (text) ====

@@ -365,7 +365,8 @@
 	struct ieee80211com *ic = &sc->sc_ic;
 	struct ifnet *ifp = ic->ic_ifp;
 	
-	rt2661_stop(sc);
+	RAL_LOCK(sc);
+	rt2661_stop_locked(sc);
 	callout_stop(&sc->watchdog_ch);
 	callout_stop(&sc->rssadapt_ch);