Date: Thu, 21 May 2009 02:29:08 GMT From: Andrew Thompson <thompsa@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 162427 for review Message-ID: <200905210229.n4L2T83Z070940@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=162427 Change 162427 by thompsa@thompsa_burger on 2009/05/21 02:29:04 Sync to HEAD. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/wlan/if_uath.c#9 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_upgt.c#6 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/wlan/if_uath.c#9 (text+ko) ==== @@ -49,7 +49,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb/wlan/if_uath.c,v 1.8 2009/05/21 00:04:17 thompsa Exp $"); +__FBSDID("$FreeBSD: head/sys/dev/usb/wlan/if_uath.c 192511 2009-05-21 02:26:51Z thompsa $"); /*- * Driver for Atheros AR5523 USB parts. @@ -355,7 +355,6 @@ #ifdef UATH_DEBUG sc->sc_debug = uath_debug; #endif - /* printout nice message */ device_set_usb2_desc(dev); /* @@ -512,14 +511,13 @@ 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); callout_drain(&sc->stat_ch); callout_drain(&sc->watchdog_ch); + usb2_transfer_unsetup(sc->sc_xfer, UATH_N_XFERS); ieee80211_ifdetach(ic); /* free buffers */ ==== //depot/projects/usb/src/sys/dev/usb/wlan/if_upgt.c#6 (text+ko) ==== @@ -1,5 +1,5 @@ /* $OpenBSD: if_upgt.c,v 1.35 2008/04/16 18:32:15 damien Exp $ */ -/* $FreeBSD: src/sys/dev/usb/wlan/if_upgt.c,v 1.4 2009/05/21 00:04:17 thompsa Exp $ */ +/* $FreeBSD: head/sys/dev/usb/wlan/if_upgt.c 192511 2009-05-21 02:26:51Z thompsa $ */ /* * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org> @@ -257,7 +257,6 @@ #ifdef UPGT_DEBUG sc->sc_debug = upgt_debug; #endif - /* printout nice message */ device_set_usb2_desc(dev); mtx_init(&sc->sc_mtx, device_get_nameunit(sc->sc_dev), MTX_NETWORK_LOCK, @@ -1996,13 +1995,12 @@ if (!device_is_attached(dev)) return 0; - usb2_transfer_unsetup(sc->sc_xfer, UPGT_N_XFERS); - upgt_stop(sc); callout_drain(&sc->sc_led_ch); callout_drain(&sc->sc_watchdog_ch); + usb2_transfer_unsetup(sc->sc_xfer, UPGT_N_XFERS); ieee80211_ifdetach(ic); 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?200905210229.n4L2T83Z070940>