Date: Mon, 30 Apr 2007 19:48:58 GMT From: Hans Petter Selasky <hselasky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 119015 for review Message-ID: <200704301948.l3UJmwQj079292@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=119015 Change 119015 by hselasky@hselasky_mini_itx on 2007/04/30 19:48:47 Change code so that we don't recurse the private mutex of various USB device drivers. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/if_aue.c#21 edit .. //depot/projects/usb/src/sys/dev/usb/if_axe.c#20 edit .. //depot/projects/usb/src/sys/dev/usb/if_cue.c#16 edit .. //depot/projects/usb/src/sys/dev/usb/if_kue.c#18 edit .. //depot/projects/usb/src/sys/dev/usb/if_rue.c#17 edit .. //depot/projects/usb/src/sys/dev/usb/if_udav.c#17 edit .. //depot/projects/usb/src/sys/dev/usb/if_ural.c#25 edit .. //depot/projects/usb/src/sys/dev/usb/if_zyd.c#8 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/if_aue.c#21 (text+ko) ==== @@ -948,10 +948,10 @@ struct aue_softc * sc = device_get_softc(dev); struct ifnet * ifp; + usbd_config_td_stop(&(sc->sc_config_td)); + mtx_lock(&(sc->sc_mtx)); - usbd_config_td_stop(&(sc->sc_config_td)); - __callout_stop(&(sc->sc_watchdog)); aue_cfg_pre_stop(sc, NULL, 0); ==== //depot/projects/usb/src/sys/dev/usb/if_axe.c#20 (text+ko) ==== @@ -935,10 +935,10 @@ struct axe_softc * sc = device_get_softc(dev); struct ifnet * ifp; + usbd_config_td_stop(&(sc->sc_config_td)); + mtx_lock(&(sc->sc_mtx)); - usbd_config_td_stop(&(sc->sc_config_td)); - __callout_stop(&sc->sc_watchdog); axe_cfg_pre_stop(sc, NULL, 0); ==== //depot/projects/usb/src/sys/dev/usb/if_cue.c#16 (text+ko) ==== @@ -587,10 +587,10 @@ struct cue_softc * sc = device_get_softc(dev); struct ifnet * ifp; + usbd_config_td_stop(&(sc->sc_config_td)); + mtx_lock(&(sc->sc_mtx)); - usbd_config_td_stop(&(sc->sc_config_td)); - __callout_stop(&(sc->sc_watchdog)); cue_cfg_pre_stop(sc, NULL, 0); ==== //depot/projects/usb/src/sys/dev/usb/if_kue.c#18 (text+ko) ==== @@ -623,10 +623,10 @@ struct kue_softc * sc = device_get_softc(dev); struct ifnet * ifp; + usbd_config_td_stop(&(sc->sc_config_td)); + mtx_lock(&(sc->sc_mtx)); - usbd_config_td_stop(&(sc->sc_config_td)); - __callout_stop(&(sc->sc_watchdog)); kue_cfg_pre_stop(sc, NULL, 0); ==== //depot/projects/usb/src/sys/dev/usb/if_rue.c#17 (text+ko) ==== @@ -841,10 +841,10 @@ struct rue_softc * sc = device_get_softc(dev); struct ifnet * ifp; + usbd_config_td_stop(&(sc->sc_config_td)); + mtx_lock(&(sc->sc_mtx)); - usbd_config_td_stop(&(sc->sc_config_td)); - __callout_stop(&sc->sc_watchdog); rue_cfg_pre_stop(sc, NULL, 0); ==== //depot/projects/usb/src/sys/dev/usb/if_udav.c#17 (text+ko) ==== @@ -453,10 +453,10 @@ struct udav_softc * sc = device_get_softc(dev); struct ifnet * ifp; + usbd_config_td_stop(&(sc->sc_config_td)); + mtx_lock(&(sc->sc_mtx)); - usbd_config_td_stop(&(sc->sc_config_td)); - __callout_stop(&sc->sc_watchdog); udav_cfg_pre_stop(sc, NULL, 0); ==== //depot/projects/usb/src/sys/dev/usb/if_ural.c#25 (text+ko) ==== @@ -560,10 +560,10 @@ struct ieee80211com *ic; struct ifnet *ifp; + usbd_config_td_stop(&(sc->sc_config_td)); + mtx_lock(&(sc->sc_mtx)); - usbd_config_td_stop(&(sc->sc_config_td)); - __callout_stop(&sc->sc_watchdog); ural_cfg_pre_stop(sc, NULL, 0); ==== //depot/projects/usb/src/sys/dev/usb/if_zyd.c#8 (text+ko) ==== @@ -2143,10 +2143,10 @@ struct ieee80211com *ic; struct ifnet *ifp; + usbd_config_td_stop(&(sc->sc_config_td)); + mtx_lock(&(sc->sc_mtx)); - usbd_config_td_stop(&(sc->sc_config_td)); - __callout_stop(&(sc->sc_watchdog)); __callout_stop(&(sc->sc_scan_callout));
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200704301948.l3UJmwQj079292>