From owner-p4-projects@FreeBSD.ORG  Thu Jan  4 20:23:43 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 04E4E16A40F; Thu,  4 Jan 2007 20:23:43 +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 B9F3916A403
	for <perforce@freebsd.org>; Thu,  4 Jan 2007 20:23:42 +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 AC9FE13C442
	for <perforce@freebsd.org>; Thu,  4 Jan 2007 20:23:42 +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 l04KNgxI010829
	for <perforce@freebsd.org>; Thu, 4 Jan 2007 20:23:42 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l04KNg4A010816
	for perforce@freebsd.org; Thu, 4 Jan 2007 20:23:42 GMT
	(envelope-from kmacy@freebsd.org)
Date: Thu, 4 Jan 2007 20:23:42 GMT
Message-Id: <200701042023.l04KNg4A010816@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 112490 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: Thu, 04 Jan 2007 20:23:43 -0000

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

Change 112490 by kmacy@kmacy_serendipity:sam_wifi on 2007/01/04 20:23:00

	make sure that the sc lock is held across rt2560_stop
	ensure that the sc lock is not held across ieee80211_ioctl

Affected files ...

.. //depot/projects/wifi/sys/dev/ral/rt2560.c#9 edit

Differences ...

==== //depot/projects/wifi/sys/dev/ral/rt2560.c#9 (text) ====

@@ -349,8 +349,10 @@
 	struct rt2560_softc *sc = xsc;
 	struct ieee80211com *ic = &sc->sc_ic;
 	struct ifnet *ifp = ic->ic_ifp;
-
+	
+	RAL_LOCK(sc);
 	rt2560_stop(sc);
+	RAL_UNLOCK(sc);
 	callout_stop(&sc->watchdog_ch);
 	callout_stop(&sc->rssadapt_ch);
 
@@ -2074,10 +2076,11 @@
 	struct ieee80211com *ic = &sc->sc_ic;
 	int error = 0;
 
-	RAL_LOCK(sc);
+
 
 	switch (cmd) {
 	case SIOCSIFFLAGS:
+		RAL_LOCK(sc);
 		if (ifp->if_flags & IFF_UP) {
 			if (ifp->if_drv_flags & IFF_DRV_RUNNING)
 				rt2560_update_promisc(sc);
@@ -2087,6 +2090,7 @@
 			if (ifp->if_drv_flags & IFF_DRV_RUNNING)
 				rt2560_stop(sc);
 		}
+		RAL_UNLOCK(sc);
 		break;
 
 	default:
@@ -2101,7 +2105,6 @@
 		error = 0;
 	}
 
-	RAL_UNLOCK(sc);
 
 	return error;
 }