The branch stable/14 has been updated by bz:
URL:
https://cgit.FreeBSD.org/src/commit/?id=dd2988b0bc36d6e8f1bc8cfe28fa62d02f7cafe8
commit dd2988b0bc36d6e8f1bc8cfe28fa62d02f7cafe8
Author: Bjoern A. Zeeb <b...@freebsd.org>
AuthorDate: 2023-11-03 21:31:29 +0000
Commit: Bjoern A. Zeeb <b...@freebsd.org>
CommitDate: 2024-02-18 16:42:38 +0000
Revert "Enter the network epoch in USB WiFi drivers when processing input"
This reverts commit 17c328b6aebfa03cd1c2cbfbbc617e3b341bf1e4.
Sponsored by: The FreeBSD Foundation
(cherry picked from commit 75f298492a12d53df97c26963ec9f2dc0b052878)
---
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 aee765ff4ac8..352af15d17cf 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 @@ tr_setup:
* 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 @@ tr_setup:
} 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 @@ tr_setup:
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 @@ tr_setup:
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 @@ tr_setup:
* 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 @@ tr_setup:
RSU_LOCK(sc);
m = next;
}
- NET_EPOCH_EXIT(et);
break;
default:
/* needs it to the inactive queue due to a error. */
