From owner-p4-projects@FreeBSD.ORG  Fri Apr 18 18:14:32 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AA8801065672; Fri, 18 Apr 2008 18:14:32 +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 6D181106564A
	for <perforce@freebsd.org>; Fri, 18 Apr 2008 18:14:32 +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 597A78FC17
	for <perforce@freebsd.org>; Fri, 18 Apr 2008 18:14:32 +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 m3IIEWZK056970
	for <perforce@freebsd.org>; Fri, 18 Apr 2008 18:14:32 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3IIEWMC056968
	for perforce@freebsd.org; Fri, 18 Apr 2008 18:14:32 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 18 Apr 2008 18:14:32 GMT
Message-Id: <200804181814.m3IIEWMC056968@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 140215 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: Fri, 18 Apr 2008 18:14:32 -0000

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

Change 140215 by sam@sam_ebb on 2008/04/18 18:14:27

	don't hold softc lock over ieee80211_start_all

Affected files ...

.. //depot/projects/vap/sys/dev/ath/if_ath.c#61 edit

Differences ...

==== //depot/projects/vap/sys/dev/ath/if_ath.c#61 (text+ko) ====

@@ -1348,7 +1348,8 @@
 	if (!ath_hal_reset(ah, sc->sc_opmode, &sc->sc_curchan, AH_FALSE, &status)) {
 		if_printf(ifp, "unable to reset hardware; hal status %u\n",
 			status);
-		goto done;
+		ATH_UNLOCK(sc);
+		return;
 	}
 	ath_chan_change(sc, ic->ic_curchan);
 
@@ -1369,7 +1370,8 @@
 	 */
 	if (ath_startrecv(sc) != 0) {
 		if_printf(ifp, "unable to start recv logic\n");
-		goto done;
+		ATH_UNLOCK(sc);
+		return;
 	}
 
 	/*
@@ -1393,9 +1395,9 @@
 		sc->sc_tx99->start(sc->sc_tx99);
 	else
 #endif
+	ATH_UNLOCK(sc);
+
 	ieee80211_start_all(ic);		/* start all vap's */
-done:
-	ATH_UNLOCK(sc);
 }
 
 static void