Date: Fri, 25 Apr 2008 19:21:55 GMT From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 140629 for review Message-ID: <200804251921.m3PJLtrr081924@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=140629 Change 140629 by sam@sam_ebb on 2008/04/25 19:21:03 loopback fix Affected files ... .. //depot/projects/vap/sys/dev/usb/if_rum.c#18 integrate Differences ... ==== //depot/projects/vap/sys/dev/usb/if_rum.c#18 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/if_rum.c,v 1.18 2008/04/20 20:35:38 sam Exp $ */ +/* $FreeBSD: src/sys/dev/usb/if_rum.c,v 1.19 2008/04/25 19:13:38 sam Exp $ */ /*- * Copyright (c) 2005-2007 Damien Bergamini <damien.bergamini@free.fr> @@ -18,7 +18,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb/if_rum.c,v 1.18 2008/04/20 20:35:38 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_rum.c,v 1.19 2008/04/25 19:13:38 sam Exp $"); /*- * Ralink Technology RT2501USB/RT2601USB chipset driver @@ -816,13 +816,14 @@ struct ieee80211com *ic = vap->iv_ic; struct rum_softc *sc = ic->ic_ifp->if_softc; + usb_rem_task(sc->sc_udev, &sc->sc_task); + usb_rem_task(sc->sc_udev, &sc->sc_scantask); callout_stop(&rvp->amrr_ch); /* do it in a process context */ sc->sc_state = nstate; sc->sc_arg = arg; - usb_rem_task(sc->sc_udev, &sc->sc_task); if (nstate == IEEE80211_S_INIT) { rvp->newstate(vap, nstate, arg); return 0;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200804251921.m3PJLtrr081924>