From 75f298492a12d53df97c26963ec9f2dc0b052878 Mon Sep 17 00:00:00 2001
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Fri, 3 Nov 2023 21:31:29 +0000
Subject: [PATCH] Revert "Enter the network epoch in USB WiFi drivers when
 processing input"

This reverts commit 17c328b6aebfa03cd1c2cbfbbc617e3b341bf1e4.

Sponsored by:	The FreeBSD Foundation
MFC after:	3 days
---
 sys/dev/otus/if_otus.c         | 3 ---
 sys/dev/rtwn/usb/rtwn_usb_rx.c | 3 ---
 sys/dev/usb/wlan/if_rsu.c      | 3 ---
 3 files changed, 9 deletions(-)

diff --git a/sys/dev/otus/if_otus.c b/sys/dev/otus/if_otus.c
index c27b982d2d6e..dbb913d83ae8 100644
--- a/sys/dev/otus/if_otus.c
+++ b/sys/dev/otus/if_otus.c
@@ -1802,7 +1802,6 @@ otus_rxeof(struct usb_xfer *xfer, struct otus_data *data, struct mbufq *rxq)
 static void
 otus_bulk_rx_callback(struct usb_xfer *xfer, usb_error_t error)
 {
-	struct epoch_tracker et;
 	struct otus_softc *sc = usbd_xfer_softc(xfer);
 	struct ieee80211com *ic = &sc->sc_ic;
 	struct ieee80211_frame *wh;
@@ -1853,7 +1852,6 @@ otus_bulk_rx_callback(struct usb_xfer *xfer, usb_error_t error)
 		 * callback and safe to unlock.
 		 */
 		OTUS_UNLOCK(sc);
-		NET_EPOCH_ENTER(et);
 		while ((m = mbufq_dequeue(&scrx)) != NULL) {
 			wh = mtod(m, struct ieee80211_frame *);
 			ni = ieee80211_find_rxnode(ic,
@@ -1866,7 +1864,6 @@ otus_bulk_rx_callback(struct usb_xfer *xfer, usb_error_t error)
 			} else
 				(void)ieee80211_input_mimo_all(ic, m);
 		}
-		NET_EPOCH_EXIT(et);
 #ifdef	IEEE80211_SUPPORT_SUPERG
 		ieee80211_ff_age_all(ic, 100);
 #endif
diff --git a/sys/dev/rtwn/usb/rtwn_usb_rx.c b/sys/dev/rtwn/usb/rtwn_usb_rx.c
index 30921bdc2101..5db967ddcc18 100644
--- a/sys/dev/rtwn/usb/rtwn_usb_rx.c
+++ b/sys/dev/rtwn/usb/rtwn_usb_rx.c
@@ -361,7 +361,6 @@ rtwn_rx_frame(struct rtwn_softc *sc, struct mbuf *m)
 void
 rtwn_bulk_rx_callback(struct usb_xfer *xfer, usb_error_t error)
 {
-	struct epoch_tracker et;
 	struct rtwn_usb_softc *uc = usbd_xfer_softc(xfer);
 	struct rtwn_softc *sc = &uc->uc_sc;
 	struct ieee80211com *ic = &sc->sc_ic;
@@ -404,7 +403,6 @@ rtwn_bulk_rx_callback(struct usb_xfer *xfer, usb_error_t error)
 			m->m_pkthdr.PH_loc.ptr = rtwn_rx_frame(sc, m);
 			m = m->m_nextpkt;
 		}
-		NET_EPOCH_ENTER(et);
 		RTWN_UNLOCK(sc);
 		m = m0;
 		while (m != NULL) {
@@ -422,7 +420,6 @@ rtwn_bulk_rx_callback(struct usb_xfer *xfer, usb_error_t error)
 			m = next;
 		}
 		RTWN_LOCK(sc);
-		NET_EPOCH_EXIT(et);
 		break;
 	default:
 		/* needs it to the inactive queue due to a error. */
diff --git a/sys/dev/usb/wlan/if_rsu.c b/sys/dev/usb/wlan/if_rsu.c
index 7a1e85f652a2..e000d1fb5992 100644
--- a/sys/dev/usb/wlan/if_rsu.c
+++ b/sys/dev/usb/wlan/if_rsu.c
@@ -2553,7 +2553,6 @@ rsu_rxeof(struct usb_xfer *xfer, struct rsu_data *data)
 static void
 rsu_bulk_rx_callback(struct usb_xfer *xfer, usb_error_t error)
 {
-	struct epoch_tracker et;
 	struct rsu_softc *sc = usbd_xfer_softc(xfer);
 	struct ieee80211com *ic = &sc->sc_ic;
 	struct ieee80211_node *ni;
@@ -2588,7 +2587,6 @@ rsu_bulk_rx_callback(struct usb_xfer *xfer, usb_error_t error)
 		 * ieee80211_input() because here is at the end of a USB
 		 * callback and safe to unlock.
 		 */
-		NET_EPOCH_ENTER(et);
 		while (m != NULL) {
 			next = m->m_next;
 			m->m_next = NULL;
@@ -2607,7 +2605,6 @@ rsu_bulk_rx_callback(struct usb_xfer *xfer, usb_error_t error)
 			RSU_LOCK(sc);
 			m = next;
 		}
-		NET_EPOCH_EXIT(et);
 		break;
 	default:
 		/* needs it to the inactive queue due to a error. */