Index: sys/dev/usb/ehci.c
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/ehci.c,v
retrieving revision 1.247
diff -u -p -r1.247 ehci.c
--- sys/dev/usb/ehci.c	11 Dec 2015 07:21:09 -0000	1.247
+++ sys/dev/usb/ehci.c	19 Dec 2015 17:36:48 -0000
@@ -380,10 +380,10 @@ ehci_init(ehci_softc_t *sc)
 	sc->sc_xferpool = pool_cache_init(sizeof(struct ehci_xfer), 0, 0, 0,
 	    "ehcixfer", NULL, IPL_USB, NULL, NULL, NULL);
 
-	sc->sc_doorbell_si = softint_establish(SOFTINT_NET | SOFTINT_MPSAFE,
+	sc->sc_doorbell_si = softint_establish(SOFTINT_USB | SOFTINT_MPSAFE,
 	    ehci_doorbell, sc);
 	KASSERT(sc->sc_doorbell_si != NULL);
-	sc->sc_pcd_si = softint_establish(SOFTINT_NET | SOFTINT_MPSAFE,
+	sc->sc_pcd_si = softint_establish(SOFTINT_USB | SOFTINT_MPSAFE,
 	    ehci_pcd, sc);
 	KASSERT(sc->sc_pcd_si != NULL);
 
Index: sys/dev/usb/ohci.c
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/ohci.c,v
retrieving revision 1.258
diff -u -p -r1.258 ohci.c
--- sys/dev/usb/ohci.c	30 Nov 2015 13:27:09 -0000	1.258
+++ sys/dev/usb/ohci.c	19 Dec 2015 17:36:50 -0000
@@ -648,7 +648,7 @@ ohci_init(ohci_softc_t *sc)
 	mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_USB);
 	cv_init(&sc->sc_softwake_cv, "ohciab");
 
-	sc->sc_rhsc_si = softint_establish(SOFTINT_NET | SOFTINT_MPSAFE,
+	sc->sc_rhsc_si = softint_establish(SOFTINT_USB | SOFTINT_MPSAFE,
 	    ohci_rhsc_softint, sc);
 
 	for (i = 0; i < OHCI_HASH_SIZE; i++)
Index: sys/dev/usb/usb.c
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/usb.c,v
retrieving revision 1.160
diff -u -p -r1.160 usb.c
--- sys/dev/usb/usb.c	29 Oct 2015 00:15:48 -0000	1.160
+++ sys/dev/usb/usb.c	19 Dec 2015 17:36:51 -0000
@@ -255,7 +255,7 @@ usb_attach(device_t parent, device_t sel
 	aprint_normal("\n");
 
 	/* XXX we should have our own level */
-	sc->sc_bus->soft = softint_establish(SOFTINT_NET | SOFTINT_MPSAFE,
+	sc->sc_bus->soft = softint_establish(SOFTINT_USB | SOFTINT_MPSAFE,
 	    usb_soft_intr, sc->sc_bus);
 	if (sc->sc_bus->soft == NULL) {
 		aprint_error("%s: can't register softintr\n",
Index: sys/dev/usb/usbdi.h
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/usbdi.h,v
retrieving revision 1.90
diff -u -p -r1.90 usbdi.h
--- sys/dev/usb/usbdi.h	17 Jul 2014 18:42:37 -0000	1.90
+++ sys/dev/usb/usbdi.h	19 Dec 2015 17:36:51 -0000
@@ -285,9 +285,11 @@ struct usbif_attach_arg {
  *
  * Eventually, IPL_USB can/should be changed
  */
-#define splusb splsoftnet
-#define splhardusb splvm
-#define IPL_SOFTUSB IPL_SOFTNET
 #define IPL_USB IPL_VM
+#define splhardusb splvm
+
+#define SOFTINT_USB SOFTINT_SERIAL
+#define IPL_SOFTUSB IPL_SOFTSERIAL
+#define splusb splsoftserial
 
 #endif /* _USBDI_H_ */
Index: sys/external/bsd/dwc2/dwc2.c
===================================================================
RCS file: /cvsroot/src/sys/external/bsd/dwc2/dwc2.c,v
retrieving revision 1.37
diff -u -p -r1.37 dwc2.c
--- sys/external/bsd/dwc2/dwc2.c	30 Aug 2015 13:02:42 -0000	1.37
+++ sys/external/bsd/dwc2/dwc2.c	19 Dec 2015 17:36:53 -0000
@@ -1612,7 +1612,7 @@ dwc2_init(struct dwc2_softc *sc)
 
 	TAILQ_INIT(&sc->sc_complete);
 
-	sc->sc_rhc_si = softint_establish(SOFTINT_NET | SOFTINT_MPSAFE,
+	sc->sc_rhc_si = softint_establish(SOFTINT_USB | SOFTINT_MPSAFE,
 	    dwc2_rhc, sc);
 
 	usb_setup_reserve(sc->sc_dev, &sc->sc_dma_reserve, sc->sc_bus.dmatag,