Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 18 Apr 2008 18:14:32 GMT
From:      Sam Leffler <sam@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 140215 for review
Message-ID:  <200804181814.m3IIEWMC056968@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200804181814.m3IIEWMC056968>