Page MenuHomeFreeBSD
Files F174362598

D26554.id77650.diff
No OneTemporary
Actions

D26554.id77650.diff
View Options

Index: head/sys/dev/rtwn/usb/rtwn_usb_rx.c
===================================================================
--- head/sys/dev/rtwn/usb/rtwn_usb_rx.c
+++ head/sys/dev/rtwn/usb/rtwn_usb_rx.c
@@ -368,7 +368,7 @@
struct rtwn_softc *sc = &uc->uc_sc;
struct ieee80211com *ic = &sc->sc_ic;
struct ieee80211_node *ni;
- struct mbuf *m = NULL, *next;
+ struct mbuf *m0, *m = NULL, *next;
struct rtwn_data *data;
RTWN_ASSERT_LOCKED(sc);
@@ -400,24 +400,30 @@
* ieee80211_input() because here is at the end of a USB
* callback and safe to unlock.
*/
+ m0 = m;
+ while (m != NULL) {
+ M_ASSERTPKTHDR(m);
+ 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) {
next = m->m_nextpkt;
m->m_nextpkt = NULL;
- ni = rtwn_rx_frame(sc, m);
-
- RTWN_UNLOCK(sc);
-
+ ni = m->m_pkthdr.PH_loc.ptr;
+ m->m_pkthdr.PH_loc.ptr = NULL;
if (ni != NULL) {
(void)ieee80211_input_mimo(ni, m);
ieee80211_free_node(ni);
} else {
(void)ieee80211_input_mimo_all(ic, m);
}
- RTWN_LOCK(sc);
m = next;
}
+ RTWN_LOCK(sc);
NET_EPOCH_EXIT(et);
break;
default:

File Metadata

Mime Type
text/plain
Expires
Sat, Oct 3, 4:53 PM (1 h, 36 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
40097791
Default Alt Text
D26554.id77650.diff (1 KB)

Event Timeline