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/ar5008.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/ar5008.c')
| -rw-r--r-- | sys/dev/ic/ar5008.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/ic/ar5008.c b/sys/dev/ic/ar5008.c index fed671d6509..3f46fd4d7b0 100644 --- a/sys/dev/ic/ar5008.c +++ b/sys/dev/ic/ar5008.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ar5008.c,v 1.29 2015/03/14 03:38:47 jsg Exp $ */ +/* $OpenBSD: ar5008.c,v 1.30 2015/11/04 12:11:59 dlg Exp $ */ /*- * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr> @@ -1058,7 +1058,7 @@ ar5008_swba_intr(struct athn_softc *sc) int error, totlen; if (ic->ic_tim_mcast_pending && - IF_IS_EMPTY(&ni->ni_savedq) && + mq_empty(&ni->ni_savedq) && SIMPLEQ_EMPTY(&sc->txq[ATHN_QID_CAB].head)) ic->ic_tim_mcast_pending = 0; @@ -1139,10 +1139,10 @@ ar5008_swba_intr(struct athn_softc *sc) if (SIMPLEQ_EMPTY(&sc->txbufs)) break; - IF_DEQUEUE(&ni->ni_savedq, m); + m = mq_dequeue(&ni->ni_savedq); if (m == NULL) break; - if (!IF_IS_EMPTY(&ni->ni_savedq)) { + if (!mq_empty(&ni->ni_savedq)) { /* more queued frames, set the more data bit */ wh = mtod(m, struct ieee80211_frame *); wh->i_fc[1] |= IEEE80211_FC1_MORE_DATA; |