Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 2 Oct 2007 07:04:46 GMT
From:      Andrew Thompson <thompsa@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 127089 for review
Message-ID:  <200710020704.l9274keR006047@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=127089

Change 127089 by thompsa@thompsa_heff on 2007/10/02 07:04:15

	- Drain the taskqueue on detach or bad things happen
	- Fix check on FW_INITED

Affected files ...

.. //depot/projects/wifi/sys/dev/ipw/if_ipw.c#34 edit

Differences ...

==== //depot/projects/wifi/sys/dev/ipw/if_ipw.c#34 (text+ko) ====

@@ -404,6 +404,10 @@
 
 	ipw_stop(sc);
 	callout_drain(&sc->sc_wdtimer);
+	taskqueue_drain(taskqueue_fast, &sc->sc_init_task);
+	taskqueue_drain(taskqueue_fast, &sc->sc_scan_task);
+	taskqueue_drain(taskqueue_fast, &sc->sc_assoc_task);
+	taskqueue_drain(taskqueue_fast, &sc->sc_disassoc_task);
 
 	if (ifp != NULL) {
 		bpfdetach(ifp);
@@ -2456,7 +2460,7 @@
 	 * NB: don't try to do this if ipw_stop_master has
 	 *     shutdown the firmware and disabled interrupts.
 	 */
-	if (sc->flags & IPW_FLAG_FW_INITED)
+	if (!(sc->flags & IPW_FLAG_FW_INITED))
 		return (0);
 
 	sc->flags &= ~IPW_FLAG_ASSOCIATED;



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