diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2015-11-04 12:12:01 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2015-11-04 12:12:01 +0000 |
| commit | b7e59297cb5c784067ee40d96174076043140730 (patch) | |
| tree | d84b71ad4933efb3509a88da5af2222affd8438a /sys/dev/ic/malo.c | |
| parent | 47528c666a66b5f625fb95953f94dd2d78bd169b (diff) | |
replace the ifqueues in net80211 with mbuf_queues.
the specific queues are ic_mgtq, ic_pwrsaveq, and ni_savedq. rtw
had its own queue for beacons.
tested by mpi@ and jmc@
ok mpi@
Diffstat (limited to 'sys/dev/ic/malo.c')
| -rw-r--r-- | sys/dev/ic/malo.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/ic/malo.c b/sys/dev/ic/malo.c index 2ab80aba5fe..9f132221dff 100644 --- a/sys/dev/ic/malo.c +++ b/sys/dev/ic/malo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: malo.c,v 1.108 2015/10/25 12:48:46 mpi Exp $ */ +/* $OpenBSD: malo.c,v 1.109 2015/11/04 12:11:59 dlg Exp $ */ /* * Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org> @@ -1010,13 +1010,13 @@ malo_start(struct ifnet *ifp) return; for (;;) { - IF_POLL(&ic->ic_mgtq, m0); + m0 = mq_dequeue(&ic->ic_mgtq); if (m0 != NULL) { if (sc->sc_txring.queued >= MALO_TX_RING_COUNT) { ifp->if_flags |= IFF_OACTIVE; + mq_requeue(&ic->ic_mgtq, m0); break; } - IF_DEQUEUE(&ic->ic_mgtq, m0); ni = m0->m_pkthdr.ph_cookie; #if NBPFILTER > 0 |