From f6549df685bf3d620a1e76d45107ee8b831ab4e2 Mon Sep 17 00:00:00 2001 From: Hans Petter Selasky Date: Mon, 2 Sep 2019 08:31:18 +0000 Subject: [PATCH] Fix regression issue after r351616. Make sure the mbuf queue gets initialized. Found by: gonzo@ MFC after: 1 week Sponsored by: Mellanox Technologies --- sys/dev/usb/net/usb_ethernet.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/dev/usb/net/usb_ethernet.c b/sys/dev/usb/net/usb_ethernet.c index 57be7d69d4a..b637f1ace0e 100644 --- a/sys/dev/usb/net/usb_ethernet.c +++ b/sys/dev/usb/net/usb_ethernet.c @@ -219,6 +219,7 @@ ue_attach_post_task(struct usb_proc_msg *_task) ue->ue_unit = alloc_unr(ueunit); usb_callout_init_mtx(&ue->ue_watchdog, ue->ue_mtx, 0); sysctl_ctx_init(&ue->ue_sysctl_ctx); + mbufq_init(&ue->ue_rxq, 0 /* unlimited length */); error = 0; CURVNET_SET_QUIET(vnet0); @@ -284,6 +285,11 @@ ue_attach_post_task(struct usb_proc_msg *_task) fail: CURVNET_RESTORE(); + + /* drain mbuf queue */ + mbufq_drain(&ue->ue_rxq); + + /* free unit */ free_unr(ueunit, ue->ue_unit); if (ue->ue_ifp != NULL) { if_free(ue->ue_ifp); @@ -330,6 +336,9 @@ uether_ifdetach(struct usb_ether *ue) /* free sysctl */ sysctl_ctx_free(&ue->ue_sysctl_ctx); + /* drain mbuf queue */ + mbufq_drain(&ue->ue_rxq); + /* free unit */ free_unr(ueunit, ue->ue_unit); }