d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix run(4) mbuf queue flushing / freeing.

Browse Source 
Ensure things are freed during interface stop, or start may end up never
being able to transmit a full queue.
This commit is contained in:
adrian 2015-10-04 05:22:17 +00:00
parent 1224cdf376
commit b30c9f839e
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/dev/usb/wlan/if_run.c
View File

@ -831,6 +831,21 @@ detach:
return (ENXIO); return (ENXIO);
} }
static void
run_drain_mbufq(struct run_softc *sc)
{
struct mbuf *m;
struct ieee80211_node *ni;
RUN_LOCK_ASSERT(sc, MA_OWNED);
while ((m = mbufq_dequeue(&sc->sc_snd)) != NULL) {
ni = (struct ieee80211_node *)m->m_pkthdr.rcvif;
m->m_pkthdr.rcvif = NULL;
ieee80211_free_node(ni);
m_freem(m);
}
}
static int static int
run_detach(device_t self) run_detach(device_t self)
{ {
@ -852,6 +867,9 @@ run_detach(device_t self)
/* free TX list, if any */ /* free TX list, if any */
for (i = 0; i != RUN_EP_QUEUES; i++) for (i = 0; i != RUN_EP_QUEUES; i++)
run_unsetup_tx_list(sc, &sc->sc_epq[i]); run_unsetup_tx_list(sc, &sc->sc_epq[i]);
/* Free TX queue */
run_drain_mbufq(sc);
RUN_UNLOCK(sc); RUN_UNLOCK(sc);
if (sc->sc_ic.ic_softc == sc) { if (sc->sc_ic.ic_softc == sc) {
@ -862,7 +880,6 @@ run_detach(device_t self)
ieee80211_ifdetach(ic); ieee80211_ifdetach(ic);
} }
mbufq_drain(&sc->sc_snd);
mtx_destroy(&sc->sc_mtx); mtx_destroy(&sc->sc_mtx);
return (0); return (0);
@ -6172,6 +6189,8 @@ run_stop(void *arg)
RUN_LOCK(sc); RUN_LOCK(sc);
run_drain_mbufq(sc);
if (sc->rx_m != NULL) { if (sc->rx_m != NULL) {
m_free(sc->rx_m); m_free(sc->rx_m);
sc->rx_m = NULL; sc->rx_m = NULL;