system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-23 11:16:33 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Revert "Widen EPOCH(9) usage in USB WLAN drivers."

Browse source 
This reverts commit 21c4082de9.

Sponsored by:	The FreeBSD Foundation
MFC after:	3 days
This commit is contained in:
Bjoern A. Zeeb 2023-11-03 21:27:15 +00:00
parent 1c6dd33d26
commit 39b7027979
7 changed files with 0 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sys/dev/usb/wlan/if_rum.c
View file

@ -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 @@ rum_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error)
else
ni = NULL;
NET_EPOCH_ENTER(et);
if (ni != NULL) {
(void) ieee80211_input(ni, m, rssi,
RT2573_NOISE_FLOOR);
@ -1293,7 +1291,6 @@ rum_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error)
} else
(void) ieee80211_input_all(ic, m, rssi,
RT2573_NOISE_FLOOR);
NET_EPOCH_EXIT(et);
}
RUM_LOCK(sc);
rum_start(sc);

3
sys/dev/usb/wlan/if_run.c
View file

@ -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;

3
sys/dev/usb/wlan/if_uath.c
View file

@ -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 @@ uath_bulk_rx_callback(struct usb_xfer *xfer, usb_error_t error)
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 @@ uath_bulk_rx_callback(struct usb_xfer *xfer, usb_error_t error)
} else
(void) ieee80211_input_all(ic, m,
(int)be32toh(desc->rssi), nf);
NET_EPOCH_EXIT(et);
m = NULL;
desc = NULL;
}

3
sys/dev/usb/wlan/if_upgt.c
View file

@ -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 @@ upgt_bulk_rx_callback(struct usb_xfer *xfer, usb_error_t error)
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);

3
sys/dev/usb/wlan/if_ural.c
View file

@ -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 @@ ural_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error)
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);

3
sys/dev/usb/wlan/if_urtw.c
View file

@ -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 @@ urtw_bulk_rx_callback(struct usb_xfer *xfer, usb_error_t error)
} 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);

3
sys/dev/usb/wlan/if_zyd.c
View file

@ -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 @@ zyd_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error)
* "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 @@ zyd_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error)
} else
(void)ieee80211_input_all(ic, m, rssi, nf);
}
NET_EPOCH_EXIT(et);
ZYD_LOCK(sc);
zyd_start(sc);
break;