The branch stable/14 has been updated by bz:
URL:
https://cgit.FreeBSD.org/src/commit/?id=b4038a0b672bed3cb3020e1673428fe1c4a8f96b
commit b4038a0b672bed3cb3020e1673428fe1c4a8f96b
Author: Bjoern A. Zeeb <b...@freebsd.org>
AuthorDate: 2023-11-03 21:27:15 +0000
Commit: Bjoern A. Zeeb <b...@freebsd.org>
CommitDate: 2024-02-18 16:42:32 +0000
Revert "Widen EPOCH(9) usage in USB WLAN drivers."
This reverts commit 21c4082de9e2cf9a0fd81a9a981ab06022956847.
Sponsored by: The FreeBSD Foundation
(cherry picked from commit 39b702797994fbd62a21dd3af6d4cd7045fded23)
---
sys/dev/usb/wlan/if_rum.c | 3 ---
sys/dev/usb/wlan/if_run.c | 3 ---
sys/dev/usb/wlan/if_uath.c | 3 ---
sys/dev/usb/wlan/if_upgt.c | 3 ---
sys/dev/usb/wlan/if_ural.c | 3 ---
sys/dev/usb/wlan/if_urtw.c | 3 ---
sys/dev/usb/wlan/if_zyd.c | 3 ---
7 files changed, 21 deletions(-)
diff --git a/sys/dev/usb/wlan/if_rum.c b/sys/dev/usb/wlan/if_rum.c
index a110dc563c2a..4e053c1c2433 100644
--- a/sys/dev/usb/wlan/if_rum.c
+++ b/sys/dev/usb/wlan/if_rum.c
@@ -1166,7 +1166,6 @@ rum_bulk_read_callback(struct usb_xfer *xfer, usb_error_t
error)
struct ieee80211com *ic = &sc->sc_ic;
struct ieee80211_frame_min *wh;
struct ieee80211_node *ni;
- struct epoch_tracker et;
struct mbuf *m = NULL;
struct usb_page_cache *pc;
uint32_t flags;
@@ -1285,7 +1284,6 @@ tr_setup:
else
ni = NULL;
- NET_EPOCH_ENTER(et);
if (ni != NULL) {
(void) ieee80211_input(ni, m, rssi,
RT2573_NOISE_FLOOR);
@@ -1293,7 +1291,6 @@ tr_setup:
} else
(void) ieee80211_input_all(ic, m, rssi,
RT2573_NOISE_FLOOR);
- NET_EPOCH_EXIT(et);
}
RUM_LOCK(sc);
rum_start(sc);
diff --git a/sys/dev/usb/wlan/if_run.c b/sys/dev/usb/wlan/if_run.c
index 2503881597cb..e2ea78f78b13 100644
--- a/sys/dev/usb/wlan/if_run.c
+++ b/sys/dev/usb/wlan/if_run.c
@@ -2870,7 +2870,6 @@ run_rx_frame(struct run_softc *sc, struct mbuf *m,
uint32_t dmalen)
struct ieee80211com *ic = &sc->sc_ic;
struct ieee80211_frame *wh;
struct ieee80211_node *ni;
- struct epoch_tracker et;
struct rt2870_rxd *rxd;
struct rt2860_rxwi *rxwi;
uint32_t flags;
@@ -2993,14 +2992,12 @@ run_rx_frame(struct run_softc *sc, struct mbuf *m,
uint32_t dmalen)
}
}
- NET_EPOCH_ENTER(et);
if (ni != NULL) {
(void)ieee80211_input(ni, m, rssi, nf);
ieee80211_free_node(ni);
} else {
(void)ieee80211_input_all(ic, m, rssi, nf);
}
- NET_EPOCH_EXIT(et);
return;
diff --git a/sys/dev/usb/wlan/if_uath.c b/sys/dev/usb/wlan/if_uath.c
index 04190821d9b9..e78003bc250a 100644
--- a/sys/dev/usb/wlan/if_uath.c
+++ b/sys/dev/usb/wlan/if_uath.c
@@ -2703,7 +2703,6 @@ uath_bulk_rx_callback(struct usb_xfer *xfer, usb_error_t
error)
struct ieee80211com *ic = &sc->sc_ic;
struct ieee80211_frame *wh;
struct ieee80211_node *ni;
- struct epoch_tracker et;
struct mbuf *m = NULL;
struct uath_data *data;
struct uath_rx_desc *desc = NULL;
@@ -2750,7 +2749,6 @@ setup:
ni = ieee80211_find_rxnode(ic,
(struct ieee80211_frame_min *)wh);
nf = -95; /* XXX */
- NET_EPOCH_ENTER(et);
if (ni != NULL) {
(void) ieee80211_input(ni, m,
(int)be32toh(desc->rssi), nf);
@@ -2759,7 +2757,6 @@ setup:
} else
(void) ieee80211_input_all(ic, m,
(int)be32toh(desc->rssi), nf);
- NET_EPOCH_EXIT(et);
m = NULL;
desc = NULL;
}
diff --git a/sys/dev/usb/wlan/if_upgt.c b/sys/dev/usb/wlan/if_upgt.c
index 8be29b7cfcdf..55d231e2c655 100644
--- a/sys/dev/usb/wlan/if_upgt.c
+++ b/sys/dev/usb/wlan/if_upgt.c
@@ -2205,7 +2205,6 @@ upgt_bulk_rx_callback(struct usb_xfer *xfer, usb_error_t
error)
struct ieee80211com *ic = &sc->sc_ic;
struct ieee80211_frame *wh;
struct ieee80211_node *ni;
- struct epoch_tracker et;
struct mbuf *m = NULL;
struct upgt_data *data;
int8_t nf;
@@ -2243,14 +2242,12 @@ setup:
ni = ieee80211_find_rxnode(ic,
(struct ieee80211_frame_min *)wh);
nf = -95; /* XXX */
- NET_EPOCH_ENTER(et);
if (ni != NULL) {
(void) ieee80211_input(ni, m, rssi, nf);
/* node is no longer needed */
ieee80211_free_node(ni);
} else
(void) ieee80211_input_all(ic, m, rssi, nf);
- NET_EPOCH_EXIT(et);
m = NULL;
}
UPGT_LOCK(sc);
diff --git a/sys/dev/usb/wlan/if_ural.c b/sys/dev/usb/wlan/if_ural.c
index 7a9adb075199..1acae6d84b53 100644
--- a/sys/dev/usb/wlan/if_ural.c
+++ b/sys/dev/usb/wlan/if_ural.c
@@ -846,7 +846,6 @@ ural_bulk_read_callback(struct usb_xfer *xfer, usb_error_t
error)
struct ural_softc *sc = usbd_xfer_softc(xfer);
struct ieee80211com *ic = &sc->sc_ic;
struct ieee80211_node *ni;
- struct epoch_tracker et;
struct mbuf *m = NULL;
struct usb_page_cache *pc;
uint32_t flags;
@@ -927,13 +926,11 @@ tr_setup:
if (m) {
ni = ieee80211_find_rxnode(ic,
mtod(m, struct ieee80211_frame_min *));
- NET_EPOCH_ENTER(et);
if (ni != NULL) {
(void) ieee80211_input(ni, m, rssi, nf);
ieee80211_free_node(ni);
} else
(void) ieee80211_input_all(ic, m, rssi, nf);
- NET_EPOCH_EXIT(et);
}
RAL_LOCK(sc);
ural_start(sc);
diff --git a/sys/dev/usb/wlan/if_urtw.c b/sys/dev/usb/wlan/if_urtw.c
index 7a3ba4c97e5e..d08a3237e9b2 100644
--- a/sys/dev/usb/wlan/if_urtw.c
+++ b/sys/dev/usb/wlan/if_urtw.c
@@ -4040,7 +4040,6 @@ urtw_bulk_rx_callback(struct usb_xfer *xfer, usb_error_t
error)
struct urtw_softc *sc = usbd_xfer_softc(xfer);
struct ieee80211com *ic = &sc->sc_ic;
struct ieee80211_node *ni;
- struct epoch_tracker et;
struct mbuf *m = NULL;
struct urtw_data *data;
int8_t nf = -95;
@@ -4084,14 +4083,12 @@ setup:
} else
ni = NULL;
- NET_EPOCH_ENTER(et);
if (ni != NULL) {
(void) ieee80211_input(ni, m, rssi, nf);
/* node is no longer needed */
ieee80211_free_node(ni);
} else
(void) ieee80211_input_all(ic, m, rssi, nf);
- NET_EPOCH_EXIT(et);
m = NULL;
}
URTW_LOCK(sc);
diff --git a/sys/dev/usb/wlan/if_zyd.c b/sys/dev/usb/wlan/if_zyd.c
index 596cf63faef2..a4dc6b972c96 100644
--- a/sys/dev/usb/wlan/if_zyd.c
+++ b/sys/dev/usb/wlan/if_zyd.c
@@ -2219,7 +2219,6 @@ zyd_bulk_read_callback(struct usb_xfer *xfer, usb_error_t
error)
struct zyd_softc *sc = usbd_xfer_softc(xfer);
struct ieee80211com *ic = &sc->sc_ic;
struct ieee80211_node *ni;
- struct epoch_tracker et;
struct zyd_rx_desc desc;
struct mbuf *m;
struct usb_page_cache *pc;
@@ -2275,7 +2274,6 @@ tr_setup:
* "ieee80211_input" here, and not some lines up!
*/
ZYD_UNLOCK(sc);
- NET_EPOCH_ENTER(et);
for (i = 0; i < sc->sc_rx_count; i++) {
rssi = sc->sc_rx_data[i].rssi;
m = sc->sc_rx_data[i].m;
@@ -2291,7 +2289,6 @@ tr_setup:
} else
(void)ieee80211_input_all(ic, m, rssi, nf);
}
- NET_EPOCH_EXIT(et);
ZYD_LOCK(sc);
zyd_start(sc);
break;
