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/acx.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/acx.c')
| -rw-r--r-- | sys/dev/ic/acx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/ic/acx.c b/sys/dev/ic/acx.c index c932aa64574..ba986b2b5dc 100644 --- a/sys/dev/ic/acx.c +++ b/sys/dev/ic/acx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acx.c,v 1.113 2015/10/25 12:48:46 mpi Exp $ */ +/* $OpenBSD: acx.c,v 1.114 2015/11/04 12:11:59 dlg Exp $ */ /* * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org> @@ -930,7 +930,7 @@ acx_start(struct ifnet *ifp) struct mbuf *m; int rate; - IF_DEQUEUE(&ic->ic_mgtq, m); + m = mq_dequeue(&ic->ic_mgtq); /* first dequeue management frames */ if (m != NULL) { ni = m->m_pkthdr.ph_cookie; @@ -958,7 +958,7 @@ acx_start(struct ifnet *ifp) struct ether_header *eh; /* then dequeue packets on the powersave queue */ - IF_DEQUEUE(&ic->ic_pwrsaveq, m); + m = mq_dequeue(&ic->ic_pwrsaveq); if (m != NULL) { ni = m->m_pkthdr.ph_cookie; goto encapped; |