1 files changed, 18 insertions, 11 deletions

diff --git a/sys/dev/usb/usb_ethersubr.c b/sys/dev/usb/usb_ethersubr.c
index da2328c37186..c02ed7dd0cb7 100644
--- a/sys/dev/usb/usb_ethersubr.c
+++ b/sys/dev/usb/usb_ethersubr.c
@@ -73,7 +73,10 @@ Static const char rcsid[] =
 #endif
 
 Static struct ifqueue usbq_rx;
+Static struct mtx usbq_rx_mtx;
 Static struct ifqueue usbq_tx;
+Static struct mtx usbq_tx_mtx;
+Static int mtx_inited = 0;
 
 Static void usbintr		__P((void));
 
@@ -83,13 +86,12 @@ Static void usbintr()
 	struct mbuf		*m;
 	struct usb_qdat		*q;
 	struct ifnet		*ifp;
-	int			s;
-
-	s = splimp();
 
 	/* Check the RX queue */
 	while(1) {
+		mtx_enter(&usbq_rx_mtx, MTX_DEF);
 		IF_DEQUEUE(&usbq_rx, m);
+		mtx_exit(&usbq_rx_mtx, MTX_DEF);
 		if (m == NULL)
 			break;
 		eh = mtod(m, struct ether_header *);
@@ -107,7 +109,9 @@ Static void usbintr()
 
 	/* Check the TX queue */
 	while(1) {
+		mtx_enter(&usbq_tx_mtx, MTX_DEF);
 		IF_DEQUEUE(&usbq_tx, m);
+		mtx_exit(&usbq_tx_mtx, MTX_DEF);
 		if (m == NULL)
 			break;
 		ifp = m->m_pkthdr.rcvif;
@@ -116,14 +120,17 @@ Static void usbintr()
 			(*ifp->if_start)(ifp);
 	}
 
-	splx(s);
-
 	return;
 }
 
 void usb_register_netisr()
 {
+	if (mtx_inited)
+		return;
 	register_netisr(NETISR_USB, usbintr);
+	mtx_init(&usbq_tx_mtx, "usbq_tx_mtx", MTX_DEF);
+	mtx_init(&usbq_rx_mtx, "usbq_rx_mtx", MTX_DEF);
+	mtx_inited++;
 	return;
 }
 
@@ -134,21 +141,21 @@ void usb_register_netisr()
 void usb_ether_input(m)
 	struct mbuf		*m;
 {
-	int			s;
-	s = splimp();
+	mtx_enter(&usbq_rx_mtx, MTX_DEF);
 	IF_ENQUEUE(&usbq_rx, m);
+	mtx_exit(&usbq_rx_mtx, MTX_DEF);
 	schednetisr(NETISR_USB);
-	splx(s);
+
 	return;
 }
 
 void usb_tx_done(m)
 	struct mbuf		*m;
 {
-	int			s;
-	s = splimp();
+	mtx_enter(&usbq_tx_mtx, MTX_DEF);
 	IF_ENQUEUE(&usbq_tx, m);
+	mtx_exit(&usbq_tx_mtx, MTX_DEF);
 	schednetisr(NETISR_USB);
-	splx(s);
+
 	return;
 }