From owner-svn-src-user@FreeBSD.ORG Thu Sep 9 00:34:55 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CD4B910656EB; Thu, 9 Sep 2010 00:34:55 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BC9EB8FC0A; Thu, 9 Sep 2010 00:34:55 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o890YtM3006118; Thu, 9 Sep 2010 00:34:55 GMT (envelope-from weongyo@svn.freebsd.org) Received: (from weongyo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o890Yt4R006115; Thu, 9 Sep 2010 00:34:55 GMT (envelope-from weongyo@svn.freebsd.org) Message-Id: <201009090034.o890Yt4R006115@svn.freebsd.org> From: Weongyo Jeong Date: Thu, 9 Sep 2010 00:34:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r212344 - user/weongyo/usb/sys/dev/usb/net X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Sep 2010 00:34:55 -0000 Author: weongyo Date: Thu Sep 9 00:34:55 2010 New Revision: 212344 URL: http://svn.freebsd.org/changeset/base/212344 Log: Detaching the miibus child should be happen after draining all parent tasks because it could access miibus API (e.g. calling mii_tick()). Modified: user/weongyo/usb/sys/dev/usb/net/if_axe.c Modified: user/weongyo/usb/sys/dev/usb/net/if_axe.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/net/if_axe.c Thu Sep 9 00:31:23 2010 (r212343) +++ user/weongyo/usb/sys/dev/usb/net/if_axe.c Thu Sep 9 00:34:55 2010 (r212344) @@ -847,13 +847,12 @@ axe_detach(device_t dev) struct axe_softc *sc = device_get_softc(dev); struct ifnet *ifp = sc->sc_ifp; - if (sc->sc_miibus != NULL) - device_delete_child(sc->sc_dev, sc->sc_miibus); - sleepout_drain(&sc->sc_watchdog); taskqueue_drain(sc->sc_sleepout.s_taskqueue, &sc->sc_setmulti); usbd_transfer_unsetup(sc->sc_xfer, AXE_N_TRANSFER); + if (sc->sc_miibus != NULL) + device_delete_child(sc->sc_dev, sc->sc_miibus); if (ifp != NULL) { AXE_LOCK(sc); ifp->if_drv_flags &= ~IFF_DRV_RUNNING;