 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_kue.c,v 1.75 2012/02/02 19:43:07 tls Exp $	*/
+/*	$NetBSD: if_kue.c,v 1.76 2012/03/10 23:01:07 mrg Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
  *	Bill Paul <wpaul@ee.columbia.edu>.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
 @@ -60,27 +60,27 @@
  * powered on and retain its firmware. In this case, we don't need
  * to load the firmware a second time.
+ *
  * Special thanks to Rob Furr for providing an ADS Technologies
  * adapter for development and testing. No monkeys were harmed during
  * the development of this driver.
  */
 /*
  * Ported to NetBSD and somewhat rewritten by Lennart Augustsson.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.75 2012/02/02 19:43:07 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.76 2012/03/10 23:01:07 mrg Exp $");
 #include "opt_inet.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/device.h>
 #include <sys/proc.h>
 @@ -976,33 +976,26 @@ kue_open_pipes(struct kue_softc *sc)
 static int
 kue_ioctl(struct ifnet *ifp, u_long command, void *data)
+{
 	struct kue_softc	*sc = ifp->if_softc;
 	struct ifaddr 		*ifa = (struct ifaddr *)data;
 	struct ifreq		*ifr = (struct ifreq *)data;
 	int			s, error = 0;
 	DPRINTFN(5,("%s: %s: enter\n", device_xname(sc->kue_dev),__func__));
 	if (sc->kue_dying)
 		return (EIO);
 #ifdef DIAGNOSTIC
 	if (!curproc) {
 		printf("%s: no proc!!\n", device_xname(sc->kue_dev));
 		return EIO;
 #endif
 	s = splnet();
 	switch(command) {
 	case SIOCINITIFADDR:
 		ifp->if_flags |= IFF_UP;
 		kue_init(sc);
 		switch (ifa->ifa_addr->sa_family) {
 #ifdef INET
 		case AF_INET:
 			arp_ifinit(ifp, ifa);
 			break;
 #endif /* INET */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ohci.c,v 1.221 2012/03/06 03:35:29 mrg Exp $	*/
+/*	$NetBSD: ohci.c,v 1.222 2012/03/10 23:01:07 mrg Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $	*/
 /*
  * Copyright (c) 1998, 2004, 2005 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net) at
  * Carlstedt Research & Technology.
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum.
+ *
  * Redistribution and use in source and binary forms, with or without
 @@ -31,27 +31,27 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * USB Open Host Controller driver.
+ *
  * OHCI spec: http://www.compaq.com/productinfo/development/openhci.html
  * USB spec: http://www.usb.org/developers/docs/
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.221 2012/03/06 03:35:29 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.222 2012/03/10 23:01:07 mrg Exp $");
 #include "opt_usb.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/select.h>
 #include <sys/proc.h>
 #include <sys/queue.h>
 #include <sys/bus.h>
 @@ -2230,27 +2230,27 @@ ohci_abort_xfer(usbd_xfer_handle xfer, u
 	DPRINTF(("ohci_abort_xfer: xfer=%p pipe=%p sed=%p\n", xfer, opipe,sed));
 	if (sc->sc_dying) {
 		/* If we're dying, just do the software part. */
 		s = splusb();
 		xfer->status = status;	/* make software ignore it */
 		callout_stop(&xfer->timeout_handle);
 		usb_transfer_complete(xfer);
 		splx(s);
 		return;
+	}
-	if (xfer->device->bus->intr_context || !curproc)
+	if (xfer->device->bus->intr_context)
 		panic("ohci_abort_xfer: not in process context");
 	/*
 	 * If an abort is already in progress then just wait for it to
 	 * complete and return.
 	 */
 	if (xfer->hcflags & UXFER_ABORTING) {
 		DPRINTFN(2, ("ohci_abort_xfer: already aborting\n"));
 #ifdef DIAGNOSTIC
 		if (status == USBD_TIMEOUT)
 			printf("0hci_abort_xfer: TIMEOUT while aborting\n");
 #endif
 		/* Override the status which might be USBD_TIMEOUT. */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uhci.c,v 1.245 2012/03/06 03:35:29 mrg Exp $	*/
+/*	$NetBSD: uhci.c,v 1.246 2012/03/10 23:01:07 mrg Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $	*/
 /*
  * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net) at
  * Carlstedt Research & Technology.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -32,27 +32,27 @@
  */
 /*
  * USB Universal Host Controller driver.
  * Handles e.g. PIIX3 and PIIX4.
+ *
  * UHCI spec: http://www.intel.com/technology/usb/spec.htm
  * USB spec: http://www.usb.org/developers/docs/
  * PIIXn spec: ftp://download.intel.com/design/intarch/datashts/29055002.pdf
  *             ftp://download.intel.com/design/intarch/datashts/29056201.pdf
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.245 2012/03/06 03:35:29 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.246 2012/03/10 23:01:07 mrg Exp $");
 #include "opt_usb.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
 #include <sys/select.h>
 #include <sys/extent.h>
 #include <sys/proc.h>
 #include <sys/queue.h>
 #include <sys/bus.h>
 @@ -2068,27 +2068,27 @@ uhci_abort_xfer(usbd_xfer_handle xfer, u
 	DPRINTFN(1,("uhci_abort_xfer: xfer=%p, status=%d\n", xfer, status));
 	if (sc->sc_dying) {
 		/* If we're dying, just do the software part. */
 		s = splusb();
 		xfer->status = status;	/* make software ignore it */
 		callout_stop(&xfer->timeout_handle);
 		usb_transfer_complete(xfer);
 		splx(s);
 		return;
+	}
-	if (xfer->device->bus->intr_context || !curproc)
+	if (xfer->device->bus->intr_context)
 		panic("uhci_abort_xfer: not in process context");
 	/*
 	 * If an abort is already in progress then just wait for it to
 	 * complete and return.
 	 */
 	if (xfer->hcflags & UXFER_ABORTING) {
 		DPRINTFN(2, ("uhci_abort_xfer: already aborting\n"));
 #ifdef DIAGNOSTIC
 		if (status == USBD_TIMEOUT)
 			printf("uhci_abort_xfer: TIMEOUT while aborting\n");
 #endif
 		/* Override the status which might be USBD_TIMEOUT. */