Date: Mon, 18 May 2009 08:46:24 GMT From: Hans Petter Selasky <hselasky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 162250 for review Message-ID: <200905180846.n4I8kOB6086103@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=162250 Change 162250 by hselasky@hselasky_laptop001 on 2009/05/18 08:46:20 USB WLAN: - correct order of operation at detach Affected files ... .. //depot/projects/usb/src/sys/dev/usb/wlan/if_uath.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_upgt.c#2 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/wlan/if_uath.c#4 (text+ko) ==== @@ -514,6 +514,8 @@ if (!device_is_attached(dev)) return (0); + usb2_transfer_unsetup(sc->sc_xfer, UATH_N_XFERS); + sc->sc_flags |= UATH_FLAG_INVALID; uath_stop(ifp); ieee80211_ifdetach(ic); @@ -521,8 +523,6 @@ callout_drain(&sc->stat_ch); callout_drain(&sc->watchdog_ch); - usb2_transfer_unsetup(sc->sc_xfer, UATH_N_XFERS); - /* free buffers */ UATH_LOCK(sc); uath_free_rx_data_list(sc); ==== //depot/projects/usb/src/sys/dev/usb/wlan/if_upgt.c#2 (text+ko) ==== @@ -2001,13 +2001,14 @@ if (!device_is_attached(dev)) return 0; + usb2_transfer_unsetup(sc->sc_xfer, UPGT_N_XFERS); + upgt_stop(sc); ieee80211_ifdetach(ic); callout_drain(&sc->sc_led_ch); callout_drain(&sc->sc_watchdog_ch); - usb2_transfer_unsetup(sc->sc_xfer, UPGT_N_XFERS); upgt_free_rx(sc); upgt_free_tx(sc);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905180846.n4I8kOB6086103>