Change users of IFQ_DEQUEUE(), IFQ_ENQUEUE() and IFQ_LEN() to use the

"new" API.

ok dlg@ tobhe@

72 files changed, 147 insertions, 158 deletions

diff --git a/sys/arch/armv7/omap/if_cpsw.c b/sys/arch/armv7/omap/if_cpsw.c
index 3b380457e3f..6c9f0f86f87 100644
--- a/sys/arch/armv7/omap/if_cpsw.c
+++ b/sys/arch/armv7/omap/if_cpsw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_cpsw.c,v 1.47 2020/04/05 14:02:29 kettenis Exp $ */
+/* $OpenBSD: if_cpsw.c,v 1.48 2020/07/10 13:22:19 patrick Exp $ */
 /*	$NetBSD: if_cpsw.c,v 1.3 2013/04/17 14:36:34 bouyer Exp $	*/
 
 /*
@@ -534,7 +534,7 @@ cpsw_start(struct ifnet *ifp)
 			break;
 		}
 
-		IFQ_DEQUEUE(&ifp->if_snd, m);
+		m = ifq_dequeue(&ifp->if_snd);
 		if (m == NULL)
 			break;
 
diff --git a/sys/arch/macppc/dev/if_bm.c b/sys/arch/macppc/dev/if_bm.c
index 348d97400cc..40a5b52c59d 100644
--- a/sys/arch/macppc/dev/if_bm.c
+++ b/sys/arch/macppc/dev/if_bm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bm.c,v 1.42 2017/03/08 12:02:41 mpi Exp $	*/
+/*	$OpenBSD: if_bm.c,v 1.43 2020/07/10 13:22:19 patrick Exp $	*/
 /*	$NetBSD: if_bm.c,v 1.1 1999/01/01 01:27:52 tsubai Exp $	*/
 
 /*-
@@ -615,7 +615,7 @@ bmac_start(struct ifnet *ifp)
 		if (ifq_is_oactive(&ifp->if_snd))
 			return;
 
-		IFQ_DEQUEUE(&ifp->if_snd, m);
+		m = ifq_dequeue(&ifp->if_snd);
 		if (m == NULL)
 			break;
 #if NBPFILTER > 0
diff --git a/sys/arch/macppc/dev/if_mc.c b/sys/arch/macppc/dev/if_mc.c
index 4fd36fb5748..d9801b0458a 100644
--- a/sys/arch/macppc/dev/if_mc.c
+++ b/sys/arch/macppc/dev/if_mc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_mc.c,v 1.29 2017/01/22 10:17:37 dlg Exp $	*/
+/*	$OpenBSD: if_mc.c,v 1.30 2020/07/10 13:22:19 patrick Exp $	*/
 /*	$NetBSD: if_mc.c,v 1.9.16.1 2006/06/21 14:53:13 yamt Exp $	*/
 
 /*-
@@ -552,7 +552,7 @@ mc_start(struct ifnet *ifp)
 		if (ifq_is_oactive(&ifp->if_snd))
 			return;
 
-		IFQ_DEQUEUE(&ifp->if_snd, m);
+		m = ifq_dequeue(&ifp->if_snd);
 		if (m == NULL)
 			return;
 
diff --git a/sys/arch/sparc64/dev/vnet.c b/sys/arch/sparc64/dev/vnet.c
index 147caf1f2ec..68bc88d677e 100644
--- a/sys/arch/sparc64/dev/vnet.c
+++ b/sys/arch/sparc64/dev/vnet.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vnet.c,v 1.60 2018/01/27 13:44:03 stsp Exp $	*/
+/*	$OpenBSD: vnet.c,v 1.61 2020/07/10 13:22:19 patrick Exp $	*/
 /*
  * Copyright (c) 2009, 2015 Mark Kettenis
  *
@@ -1132,7 +1132,7 @@ vnet_start(struct ifnet *ifp)
 			break;
 		}
 
-		IFQ_DEQUEUE(&ifp->if_snd, m);
+		m = ifq_dequeue(&ifp->if_snd);
 		if (m == NULL) {
 			pool_put(&sc->sc_pool, buf);
 			break;
@@ -1209,7 +1209,7 @@ vnet_start_desc(struct ifnet *ifp)
 			return;
 		}
 
-		IFQ_DEQUEUE(&ifp->if_snd, m);
+		m = ifq_dequeue(&ifp->if_snd);
 		if (m == NULL) {
 			pool_put(&sc->sc_pool, buf);
 			return;
diff --git a/sys/dev/ic/acx.c b/sys/dev/ic/acx.c
index d758d837a0b..806d8c184a8 100644
--- a/sys/dev/ic/acx.c
+++ b/sys/dev/ic/acx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acx.c,v 1.122 2020/01/11 08:16:18 cheloha Exp $ */
+/*	$OpenBSD: acx.c,v 1.123 2020/07/10 13:22:19 patrick Exp $ */
 
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -950,7 +950,7 @@ acx_start(struct ifnet *ifp)
 				ni = m->m_pkthdr.ph_cookie;
 				goto encapped;
 			} else {
-				IFQ_DEQUEUE(&ifp->if_snd, m);
+				m = ifq_dequeue(&ifp->if_snd);
 				if (m == NULL)
 					break;
 			}
diff --git a/sys/dev/ic/am7990.c b/sys/dev/ic/am7990.c
index ce092ebf5ac..72370cf1dfd 100644
--- a/sys/dev/ic/am7990.c
+++ b/sys/dev/ic/am7990.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: am7990.c,v 1.53 2017/01/22 10:17:37 dlg Exp $	*/
+/*	$OpenBSD: am7990.c,v 1.54 2020/07/10 13:22:19 patrick Exp $	*/
 /*	$NetBSD: am7990.c,v 1.74 2012/02/02 19:43:02 tls Exp $	*/
 
 /*-
@@ -483,7 +483,7 @@ am7990_start(struct ifnet *ifp)
 			    sc->sc_no_td, sc->sc_last_td);
 		}
 
-		IFQ_DEQUEUE(&ifp->if_snd, m);
+		m = ifq_dequeue(&ifp->if_snd);
 		if (m == NULL)
 			break;
 
diff --git a/sys/dev/ic/am79900.c b/sys/dev/ic/am79900.c
index 79e1c9e28cc..6f943c578e1 100644
--- a/sys/dev/ic/am79900.c
+++ b/sys/dev/ic/am79900.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: am79900.c,v 1.7 2017/01/22 10:17:37 dlg Exp $	*/
+/*	$OpenBSD: am79900.c,v 1.8 2020/07/10 13:22:19 patrick Exp $	*/
 /*	$NetBSD: am79900.c,v 1.23 2012/02/02 19:43:02 tls Exp $	*/
 
 /*-
@@ -506,7 +506,7 @@ am79900_start(struct ifnet *ifp)
 			    sc->sc_no_td, sc->sc_last_td);
 		}
 
-		IFQ_DEQUEUE(&ifp->if_snd, m);
+		m = ifq_dequeue(&ifp->if_snd);
 		if (m == NULL)
 			break;
 
diff --git a/sys/dev/ic/ath.c b/sys/dev/ic/ath.c
index aae0b2a87ff..5e291235249 100644
--- a/sys/dev/ic/ath.c
+++ b/sys/dev/ic/ath.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ath.c,v 1.118 2020/02/19 11:05:04 claudio Exp $  */
+/*      $OpenBSD: ath.c,v 1.119 2020/07/10 13:22:19 patrick Exp $  */
 /*	$NetBSD: ath.c,v 1.37 2004/08/18 21:59:39 dyoung Exp $	*/
 
 /*-
@@ -845,7 +845,7 @@ ath_start(struct ifnet *ifp)
 				splx(s);
 				break;
 			}
-			IFQ_DEQUEUE(&ifp->if_snd, m);
+			m = ifq_dequeue(&ifp->if_snd);
 			if (m == NULL) {
 				s = splnet();
 				TAILQ_INSERT_TAIL(&sc->sc_txbuf, bf, bf_list);
diff --git a/sys/dev/ic/athn.c b/sys/dev/ic/athn.c
index 5f84db0b1ea..d20bb5615c2 100644
--- a/sys/dev/ic/athn.c
+++ b/sys/dev/ic/athn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: athn.c,v 1.108 2020/07/06 11:28:51 stsp Exp $	*/
+/*	$OpenBSD: athn.c,v 1.109 2020/07/10 13:22:19 patrick Exp $	*/
 
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -2873,7 +2873,7 @@ athn_start(struct ifnet *ifp)
 			break;
 
 		/* Encapsulate and send data frames. */
-		IFQ_DEQUEUE(&ifp->if_snd, m);
+		m = ifq_dequeue(&ifp->if_snd);
 		if (m == NULL)
 			break;
 #if NBPFILTER > 0
diff --git a/sys/dev/ic/atw.c b/sys/dev/ic/atw.c
index cf80921d5d4..df9e7c2e7c1 100644
--- a/sys/dev/ic/atw.c
+++ b/sys/dev/ic/atw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atw.c,v 1.97 2019/09/12 12:55:07 stsp Exp $	*/
+/*	$OpenBSD: atw.c,v 1.98 2020/07/10 13:22:19 patrick Exp $	*/
 /*	$NetBSD: atw.c,v 1.69 2004/07/23 07:07:55 dyoung Exp $	*/
 
 /*-
@@ -3603,7 +3603,7 @@ atw_start(struct ifnet *ifp)
 			/* send no data packets until we are associated */
 			if (ic->ic_state != IEEE80211_S_RUN)
 				break;
-			IFQ_DEQUEUE(&ifp->if_snd, m0);
+			m0 = ifq_dequeue(&ifp->if_snd);
 			if (m0 == NULL)
 				break;
 #if NBPFILTER > 0
diff --git a/sys/dev/ic/bwi.c b/sys/dev/ic/bwi.c
index 679fda47fa8..73caf29a7f3 100644
--- a/sys/dev/ic/bwi.c
+++ b/sys/dev/ic/bwi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bwi.c,v 1.128 2019/09/12 12:55:07 stsp Exp $	*/
+/*	$OpenBSD: bwi.c,v 1.129 2020/07/10 13:22:19 patrick Exp $	*/
 
 /*
  * Copyright (c) 2007 The DragonFly Project.  All rights reserved.
@@ -7189,7 +7189,7 @@ bwi_start(struct ifnet *ifp)
 			if (ic->ic_state != IEEE80211_S_RUN)
 				break;
 
-			IFQ_DEQUEUE(&ifp->if_snd, m);
+			m = ifq_dequeue(&ifp->if_snd);
 			if (m == NULL)
 				break;
 
diff --git a/sys/dev/ic/dc.c b/sys/dev/ic/dc.c
index 5e8b8fce451..9903977378e 100644
--- a/sys/dev/ic/dc.c
+++ b/sys/dev/ic/dc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dc.c,v 1.152 2017/01/22 10:17:37 dlg Exp $	*/
+/*	$OpenBSD: dc.c,v 1.153 2020/07/10 13:22:19 patrick Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -2574,7 +2574,7 @@ dc_start(struct ifnet *ifp)
 	struct mbuf *m;
 	int idx;
 
-	if (!sc->dc_link && IFQ_LEN(&ifp->if_snd) < 10)
+	if (!sc->dc_link && ifq_len(&ifp->if_snd) < 10)
 		return;
 
 	if (ifq_is_oactive(&ifp->if_snd))
diff --git a/sys/dev/ic/dp8390.c b/sys/dev/ic/dp8390.c
index 083100c51a3..dad079c026f 100644
--- a/sys/dev/ic/dp8390.c
+++ b/sys/dev/ic/dp8390.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dp8390.c,v 1.61 2017/01/22 10:17:38 dlg Exp $	*/
+/*	$OpenBSD: dp8390.c,v 1.62 2020/07/10 13:22:19 patrick Exp $	*/
 /*	$NetBSD: dp8390.c,v 1.13 1998/07/05 06:49:11 jonathan Exp $	*/
 
 /*
@@ -437,7 +437,7 @@ outloop:
 		ifq_set_oactive(&ifp->if_snd);
 		return;
 	}
-	IFQ_DEQUEUE(&ifp->if_snd, m0);
+	m0 = ifq_dequeue(&ifp->if_snd);
 	if (m0 == NULL)
 		return;
 
diff --git a/sys/dev/ic/i82596.c b/sys/dev/ic/i82596.c
index f01a1c02929..5715d64ea72 100644
--- a/sys/dev/ic/i82596.c
+++ b/sys/dev/ic/i82596.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i82596.c,v 1.53 2017/01/22 10:17:38 dlg Exp $	*/
+/*	$OpenBSD: i82596.c,v 1.54 2020/07/10 13:22:19 patrick Exp $	*/
 /*	$NetBSD: i82586.c,v 1.18 1998/08/15 04:42:42 mycroft Exp $	*/
 
 /*-
@@ -1221,7 +1221,7 @@ i82596_start(ifp)
 			break;
 		}
 
-		IFQ_DEQUEUE(&ifp->if_snd, m0);
+		m0 = ifq_dequeue(&ifp->if_snd);
 		if (m0 == NULL)
 			break;
 
diff --git a/sys/dev/ic/if_wi.c b/sys/dev/ic/if_wi.c
index 6513b7fe02e..6ab438eda0a 100644
--- a/sys/dev/ic/if_wi.c
+++ b/sys/dev/ic/if_wi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wi.c,v 1.172 2020/04/06 19:45:47 cheloha Exp $	*/
+/*	$OpenBSD: if_wi.c,v 1.173 2020/07/10 13:22:19 patrick Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -2329,7 +2329,7 @@ wi_start(struct ifnet *ifp)
 		return;
 
 nextpkt:
-	IFQ_DEQUEUE(&ifp->if_snd, m0);
+	m0 = ifq_dequeue(&ifp->if_snd);
 	if (m0 == NULL)
 		return;
 
diff --git a/sys/dev/ic/malo.c b/sys/dev/ic/malo.c
index 6f8d9a1e44c..6f52d451aeb 100644
--- a/sys/dev/ic/malo.c
+++ b/sys/dev/ic/malo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: malo.c,v 1.119 2019/09/12 12:55:07 stsp Exp $ */
+/*	$OpenBSD: malo.c,v 1.120 2020/07/10 13:22:20 patrick Exp $ */
 
 /*
  * Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org>
@@ -1015,7 +1015,7 @@ malo_start(struct ifnet *ifp)
 			if (ic->ic_state != IEEE80211_S_RUN)
 				break;
 
-			IFQ_DEQUEUE(&ifp->if_snd, m0);
+			m0 = ifq_dequeue(&ifp->if_snd);
 			if (m0 == NULL)
 				break;
 #if NBPFILTER > 0
diff --git a/sys/dev/ic/mtd8xx.c b/sys/dev/ic/mtd8xx.c
index 1e98c2cac10..f5639ff1960 100644
--- a/sys/dev/ic/mtd8xx.c
+++ b/sys/dev/ic/mtd8xx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mtd8xx.c,v 1.31 2017/01/22 10:17:38 dlg Exp $	*/
+/*	$OpenBSD: mtd8xx.c,v 1.32 2020/07/10 13:22:20 patrick Exp $	*/
 
 /*
  * Copyright (c) 2003 Oleg Safiullin <form@pdp11.org.ru>
@@ -700,7 +700,7 @@ mtd_start(struct ifnet *ifp)
 
 	idx = sc->mtd_cdata.mtd_tx_prod;
 	while (sc->mtd_cdata.mtd_tx_chain[idx].sd_mbuf == NULL) {
-		IFQ_DEQUEUE(&ifp->if_snd, m_head);
+		m_head = ifq_dequeue(&ifp->if_snd);
 		if (m_head == NULL)
 			break;
 
diff --git a/sys/dev/ic/rt2560.c b/sys/dev/ic/rt2560.c
index 7009e393e54..0cea2f80840 100644
--- a/sys/dev/ic/rt2560.c
+++ b/sys/dev/ic/rt2560.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rt2560.c,v 1.86 2020/02/19 11:05:04 claudio Exp $  */
+/*	$OpenBSD: rt2560.c,v 1.87 2020/07/10 13:22:20 patrick Exp $  */
 
 /*-
  * Copyright (c) 2005, 2006
@@ -1943,7 +1943,7 @@ rt2560_start(struct ifnet *ifp)
 			if (ic->ic_state != IEEE80211_S_RUN)
 				break;
 
-			IFQ_DEQUEUE(&ifp->if_snd, m0);
+			m0 = ifq_dequeue(&ifp->if_snd);
 			if (m0 == NULL)
 				break;
 #if NBPFILTER > 0
diff --git a/sys/dev/ic/rt2661.c b/sys/dev/ic/rt2661.c
index 9e90245697e..7170cb0085c 100644
--- a/sys/dev/ic/rt2661.c
+++ b/sys/dev/ic/rt2661.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rt2661.c,v 1.96 2020/02/19 11:05:04 claudio Exp $	*/
+/*	$OpenBSD: rt2661.c,v 1.97 2020/07/10 13:22:20 patrick Exp $	*/
 
 /*-
  * Copyright (c) 2006
@@ -1937,7 +1937,7 @@ rt2661_start(struct ifnet *ifp)
 			if (ic->ic_state != IEEE80211_S_RUN)
 				break;
 
-			IFQ_DEQUEUE(&ifp->if_snd, m0);
+			m0 = ifq_dequeue(&ifp->if_snd);
 			if (m0 == NULL)
 				break;
 #if NBPFILTER > 0
diff --git a/sys/dev/ic/rt2860.c b/sys/dev/ic/rt2860.c
index bc8763376c3..fa9b12e7275 100644
--- a/sys/dev/ic/rt2860.c
+++ b/sys/dev/ic/rt2860.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rt2860.c,v 1.98 2020/02/19 11:05:04 claudio Exp $	*/
+/*	$OpenBSD: rt2860.c,v 1.99 2020/07/10 13:22:20 patrick Exp $	*/
 
 /*-
  * Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -1771,7 +1771,7 @@ rt2860_start(struct ifnet *ifp)
 		}
 
 		/* encapsulate and send data frames */
-		IFQ_DEQUEUE(&ifp->if_snd, m);
+		m = ifq_dequeue(&ifp->if_snd);
 		if (m == NULL)
 			break;
 #if NBPFILTER > 0
diff --git a/sys/dev/ic/rtl81x9.c b/sys/dev/ic/rtl81x9.c
index 10c95e72058..1726d68f218 100644
--- a/sys/dev/ic/rtl81x9.c
+++ b/sys/dev/ic/rtl81x9.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtl81x9.c,v 1.96 2017/01/22 10:17:38 dlg Exp $ */
+/*	$OpenBSD: rtl81x9.c,v 1.97 2020/07/10 13:22:20 patrick Exp $ */
 
 /*
  * Copyright (c) 1997, 1998
@@ -850,7 +850,7 @@ rl_start(struct ifnet *ifp)
 	int		pkts = 0;
 
 	while (RL_CUR_TXMBUF(sc) == NULL) {
-		IFQ_DEQUEUE(&ifp->if_snd, m_head);
+		m_head = ifq_dequeue(&ifp->if_snd);
 		if (m_head == NULL)
 			break;
 
diff --git a/sys/dev/ic/rtwn.c b/sys/dev/ic/rtwn.c
index 2f322acb96f..166e4affec6 100644
--- a/sys/dev/ic/rtwn.c
+++ b/sys/dev/ic/rtwn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtwn.c,v 1.50 2020/06/11 00:56:12 jmatthew Exp $	*/
+/*	$OpenBSD: rtwn.c,v 1.51 2020/07/10 13:22:20 patrick Exp $	*/
 
 /*-
  * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -1503,7 +1503,7 @@ rtwn_start(struct ifnet *ifp)
 			break;
 
 		/* Encapsulate and send data frames. */
-		IFQ_DEQUEUE(&ifp->if_snd, m);
+		m = ifq_dequeue(&ifp->if_snd);
 		if (m == NULL)
 			break;
 #if NBPFILTER > 0
diff --git a/sys/dev/ic/xl.c b/sys/dev/ic/xl.c
index 0a0a7b7d2aa..e4c3dd23daf 100644
--- a/sys/dev/ic/xl.c
+++ b/sys/dev/ic/xl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xl.c,v 1.133 2020/06/22 02:27:04 dlg Exp $	*/
+/*	$OpenBSD: xl.c,v 1.134 2020/07/10 13:22:20 patrick Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -1664,7 +1664,7 @@ xl_start(struct ifnet *ifp)
 	start_tx = sc->xl_cdata.xl_tx_free;
 
 	while (sc->xl_cdata.xl_tx_free != NULL) {
-		IFQ_DEQUEUE(&ifp->if_snd, m_head);
+		m_head = ifq_dequeue(&ifp->if_snd);
 		if (m_head == NULL)
 			break;
 
@@ -1793,7 +1793,7 @@ xl_start_90xB(struct ifnet *ifp)
 			break;
 		}
 
-		IFQ_DEQUEUE(&ifp->if_snd, m_head);
+		m_head = ifq_dequeue(&ifp->if_snd);
 		if (m_head == NULL)
 			break;
 
diff --git a/sys/dev/isa/if_eg.c b/sys/dev/isa/if_eg.c
index d2e979c3095..abbd04dc03f 100644
--- a/sys/dev/isa/if_eg.c
+++ b/sys/dev/isa/if_eg.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_eg.c,v 1.49 2017/09/08 05:36:52 deraadt Exp $	*/
+/*	$OpenBSD: if_eg.c,v 1.50 2020/07/10 13:22:20 patrick Exp $	*/
 /*	$NetBSD: if_eg.c,v 1.26 1996/05/12 23:52:27 mycroft Exp $	*/
 
 /*
@@ -501,7 +501,7 @@ egstart(struct ifnet *ifp)
 
 loop:
 	/* Dequeue the next datagram. */
-	IFQ_DEQUEUE(&ifp->if_snd, m0);
+	m0 = ifq_dequeue(&ifp->if_snd);
 	if (m0 == NULL)
 		return;
 	
diff --git a/sys/dev/isa/if_el.c b/sys/dev/isa/if_el.c
index 8713727238a..7f5b058e0de 100644
--- a/sys/dev/isa/if_el.c
+++ b/sys/dev/isa/if_el.c
@@ -1,4 +1,4 @@
-/*    $OpenBSD: if_el.c,v 1.34 2017/01/22 10:17:38 dlg Exp $       */
+/*    $OpenBSD: if_el.c,v 1.35 2020/07/10 13:22:20 patrick Exp $       */
 /*	$NetBSD: if_el.c,v 1.39 1996/05/12 23:52:32 mycroft Exp $	*/
 
 /*
@@ -308,7 +308,7 @@ elstart(ifp)
 	 */
 	for (;;) {
 		/* Dequeue the next datagram. */
-		IFQ_DEQUEUE(&ifp->if_snd, m0);
+		m0 = ifq_dequeue(&ifp->if_snd);
 
 		/* If there's nothing to send, return. */
 		if (m0 == NULL)
diff --git a/sys/dev/isa/if_ie.c b/sys/dev/isa/if_ie.c
index 87959d7b878..57ff5ffaf7a 100644
--- a/sys/dev/isa/if_ie.c
+++ b/sys/dev/isa/if_ie.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ie.c,v 1.55 2019/12/19 20:23:25 jmc Exp $	*/
+/*	$OpenBSD: if_ie.c,v 1.56 2020/07/10 13:22:20 patrick Exp $	*/
 /*	$NetBSD: if_ie.c,v 1.51 1996/05/12 23:52:48 mycroft Exp $	*/
 
 /*-
@@ -1356,7 +1356,7 @@ iestart(ifp)
 			break;
 		}
 
-		IFQ_DEQUEUE(&ifp->if_snd, m0);
+		m0 = ifq_dequeue(&ifp->if_snd);
 		if (m0 == NULL)
 			break;
 
diff --git a/sys/dev/pci/if_age.c b/sys/dev/pci/if_age.c
index bedcb8ce282..1d3947948e1 100644
--- a/sys/dev/pci/if_age.c
+++ b/sys/dev/pci/if_age.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_age.c,v 1.35 2017/09/08 05:36:52 deraadt Exp $	*/
+/*	$OpenBSD: if_age.c,v 1.36 2020/07/10 13:22:20 patrick Exp $	*/
 
 /*-
  * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
@@ -971,7 +971,7 @@ age_start(struct ifnet *ifp)
 			break;
 		}
 
-		IFQ_DEQUEUE(&ifp->if_snd, m);
+		m = ifq_dequeue(&ifp->if_snd);
 		if (m == NULL)
 			break;
 
diff --git a/sys/dev/pci/if_alc.c b/sys/dev/pci/if_alc.c
index 803da77bff1..3e718c552ae 100644
--- a/sys/dev/pci/if_alc.c
+++ b/sys/dev/pci/if_alc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_alc.c,v 1.52 2019/07/06 13:55:20 kevlo Exp $	*/
+/*	$OpenBSD: if_alc.c,v 1.53 2020/07/10 13:22:20 patrick Exp $	*/
 /*-
  * Copyright (c) 2009, Pyun YongHyeon <yongari@FreeBSD.org>
  * All rights reserved.
@@ -1915,7 +1915,7 @@ alc_start(struct ifnet *ifp)
 			break;
 		}
 
-		IFQ_DEQUEUE(&ifp->if_snd, m);
+		m = ifq_dequeue(&ifp->if_snd);
 		if (m == NULL)
 			break;
 
diff --git a/sys/dev/pci/if_ale.c b/sys/dev/pci/if_ale.c
index 8b920166646..e5c5da37a7c 100644
--- a/sys/dev/pci/if_ale.c
+++ b/sys/dev/pci/if_ale.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ale.c,v 1.46 2017/09/08 05:36:52 deraadt Exp $	*/
+/*	$OpenBSD: if_ale.c,v 1.47 2020/07/10 13:22:20 patrick Exp $	*/
 /*-
  * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
  * All rights reserved.
@@ -998,7 +998,7 @@ ale_start(struct ifnet *ifp)
 			break;
 		}
 
-		IFQ_DEQUEUE(&ifp->if_snd, m);
+		m = ifq_dequeue(&ifp->if_snd);
 		if (m == NULL)
 			break;
 
diff --git a/sys/dev/pci/if_bce.c b/sys/dev/pci/if_bce.c
index 7228bba3904..c5ce1c2867f 100644
--- a/sys/dev/pci/if_bce.c
+++ b/sys/dev/pci/if_bce.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_bce.c,v 1.52 2017/01/22 10:17:38 dlg Exp $ */
+/* $OpenBSD: if_bce.c,v 1.53 2020/07/10 13:22:20 patrick Exp $ */
 /* $NetBSD: if_bce.c,v 1.3 2003/09/29 01:53:02 mrg Exp $	 */
 
 /*
@@ -533,7 +533,7 @@ bce_start(struct ifnet *ifp)
 	while (txsfree > 0) {
 
 		/* Grab a packet off the queue. */
-		IFQ_DEQUEUE(&ifp->if_snd, m0);
+		m0 = ifq_dequeue(&ifp->if_snd);
 		if (m0 == NULL)
 			break;
 
diff --git a/sys/dev/pci/if_cas.c b/sys/dev/pci/if_cas.c
index 1c66dd39836..3e4f4de7b4f 100644
--- a/sys/dev/pci/if_cas.c
+++ b/sys/dev/pci/if_cas.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_cas.c,v 1.51 2017/01/22 10:17:38 dlg Exp $	*/
+/*	$OpenBSD: if_cas.c,v 1.52 2020/07/10 13:22:20 patrick Exp $	*/
 
 /*
  *
@@ -1885,7 +1885,7 @@ cas_start(struct ifnet *ifp)
 			break;
 		}
 
-		IFQ_DEQUEUE(&ifp->if_snd, m);
+		m = ifq_dequeue(&ifp->if_snd);
 		if (m == NULL)
 			break;
 
diff --git a/sys/dev/pci/if_et.c b/sys/dev/pci/if_et.c
index ee388194231..b10094cb72e 100644
--- a/sys/dev/pci/if_et.c
+++ b/sys/dev/pci/if_et.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_et.c,v 1.37 2017/09/08 05:36:52 deraadt Exp $	*/
+/*	$OpenBSD: if_et.c,v 1.38 2020/07/10 13:22:20 patrick Exp $	*/
 /*
  * Copyright (c) 2007 The DragonFly Project.  All rights reserved.
  * 
@@ -1070,7 +1070,7 @@ et_start(struct ifnet *ifp)
 
 	trans = 0;
 	for (;;) {
-		IFQ_DEQUEUE(&ifp->if_snd, m);
+		m = ifq_dequeue(&ifp->if_snd);
 		if (m == NULL)
 			break;
 
diff --git a/sys/dev/pci/if_ipw.c b/sys/dev/pci/if_ipw.c
index 89d0fac49ce..20a9b617e6d 100644
--- a/sys/dev/pci/if_ipw.c
+++ b/sys/dev/pci/if_ipw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ipw.c,v 1.126 2019/09/30 01:53:05 dlg Exp $	*/
+/*	$OpenBSD: if_ipw.c,v 1.127 2020/07/10 13:22:20 patrick Exp $	*/
 
 /*-
  * Copyright (c) 2004-2008
@@ -1286,7 +1286,7 @@ ipw_start(struct ifnet *ifp)
 			break;
 		}
 
-		IFQ_DEQUEUE(&ifp->if_snd, m);
+		m = ifq_dequeue(&ifp->if_snd);
 		if (m == NULL)
 			break;
 
diff --git a/sys/dev/pci/if_iwi.c b/sys/dev/pci/if_iwi.c
index e7093399642..8ed15f30328 100644
--- a/sys/dev/pci/if_iwi.c
+++ b/sys/dev/pci/if_iwi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_iwi.c,v 1.143 2019/09/30 01:53:05 dlg Exp $	*/
+/*	$OpenBSD: if_iwi.c,v 1.144 2020/07/10 13:22:20 patrick Exp $	*/
 
 /*-
  * Copyright (c) 2004-2008
@@ -1380,7 +1380,7 @@ iwi_start(struct ifnet *ifp)
 			break;
 		}
 
-		IFQ_DEQUEUE(&ifp->if_snd, m0);
+		m0 = ifq_dequeue(&ifp->if_snd);
 		if (m0 == NULL)
 			break;
 
diff --git a/sys/dev/pci/if_iwm.c b/sys/dev/pci/if_iwm.c
index 3a75d07a60a..c788d9762fd 100644
--- a/sys/dev/pci/if_iwm.c
+++ b/sys/dev/pci/if_iwm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_iwm.c,v 1.312 2020/06/11 11:27:44 stsp Exp $	*/
+/*	$OpenBSD: if_iwm.c,v 1.313 2020/07/10 13:22:20 patrick Exp $	*/
 
 /*
  * Copyright (c) 2014, 2016 genua gmbh <info@genua.de>
@@ -8035,7 +8035,7 @@ iwm_start(struct ifnet *ifp)
 		    (ic->ic_xflags & IEEE80211_F_TX_MGMT_ONLY))
 			break;
 
-		IFQ_DEQUEUE(&ifp->if_snd, m);
+		m = ifq_dequeue(&ifp->if_snd);
 		if (!m)
 			break;
 		if (m->m_len < sizeof (*eh) &&
diff --git a/sys/dev/pci/if_iwn.c b/sys/dev/pci/if_iwn.c
index b7ba80097b8..f42cb27d391 100644
--- a/sys/dev/pci/if_iwn.c
+++ b/sys/dev/pci/if_iwn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_iwn.c,v 1.233 2020/06/11 11:27:44 stsp Exp $	*/
+/*	$OpenBSD: if_iwn.c,v 1.234 2020/07/10 13:22:20 patrick Exp $	*/
 
 /*-
  * Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -3751,7 +3751,7 @@ iwn_start(struct ifnet *ifp)
 			break;
 
 		/* Encapsulate and send data frames. */
-		IFQ_DEQUEUE(&ifp->if_snd, m);
+		m = ifq_dequeue(&ifp->if_snd);
 		if (m == NULL)
 			break;
 #if NBPFILTER > 0
diff --git a/sys/dev/pci/if_iwx.c b/sys/dev/pci/if_iwx.c
index 1ee0343a6d1..62327da989d 100644
--- a/sys/dev/pci/if_iwx.c
+++ b/sys/dev/pci/if_iwx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_iwx.c,v 1.38 2020/07/07 11:54:01 stsp Exp $	*/
+/*	$OpenBSD: if_iwx.c,v 1.39 2020/07/10 13:22:20 patrick Exp $	*/
 
 /*
  * Copyright (c) 2014, 2016 genua gmbh <info@genua.de>
@@ -6647,7 +6647,7 @@ iwx_start(struct ifnet *ifp)
 		    (ic->ic_xflags & IEEE80211_F_TX_MGMT_ONLY))
 			break;
 
-		IFQ_DEQUEUE(&ifp->if_snd, m);
+		m = ifq_dequeue(&ifp->if_snd);
 		if (!m)
 			break;
 		if (m->m_len < sizeof (*eh) &&
diff --git a/sys/dev/pci/if_jme.c b/sys/dev/pci/if_jme.c
index 092789f33a0..95b3f6cd666 100644
--- a/sys/dev/pci/if_jme.c
+++ b/sys/dev/pci/if_jme.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_jme.c,v 1.52 2019/05/27 20:42:00 jmc Exp $	*/
+/*	$OpenBSD: if_jme.c,v 1.53 2020/07/10 13:22:20 patrick Exp $	*/
 /*-
  * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
  * All rights reserved.
@@ -1219,7 +1219,7 @@ jme_start(struct ifnet *ifp)
 			break;
 		}
 
-		IFQ_DEQUEUE(&ifp->if_snd, m);
+		m = ifq_dequeue(&ifp->if_snd);
 		if (m == NULL)
 			break;
 
diff --git a/sys/dev/pci/if_oce.c b/sys/dev/pci/if_oce.c
index a840370d85a..7d104f016cf 100644
--- a/sys/dev/pci/if_oce.c
+++ b/sys/dev/pci/if_oce.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_oce.c,v 1.101 2020/06/22 02:31:32 dlg Exp $	*/
+/*	$OpenBSD: if_oce.c,v 1.102 2020/07/10 13:22:21 patrick Exp $	*/
 
 /*
  * Copyright (c) 2012 Mike Belopuhov
@@ -1180,7 +1180,7 @@ oce_start(struct ifnet *ifp)
 		return;
 
 	for (;;) {
-		IFQ_DEQUEUE(&ifp->if_snd, m);
+		m = ifq_dequeue(&ifp->if_snd);
 		if (m == NULL)
 			break;
 
diff --git a/sys/dev/pci/if_ste.c b/sys/dev/pci/if_ste.c
index 870443d1148..faecd3f2f10 100644
--- a/sys/dev/pci/if_ste.c
+++ b/sys/dev/pci/if_ste.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ste.c,v 1.65 2017/01/22 10:17:38 dlg Exp $ */
+/*	$OpenBSD: if_ste.c,v 1.66 2020/07/10 13:22:21 patrick Exp $ */
 /*
  * Copyright (c) 1997, 1998, 1999
  *	Bill Paul <wpaul@ctr.columbia.edu>.  All rights reserved.
@@ -1325,7 +1325,7 @@ ste_start(struct ifnet *ifp)
 			break;
 		}
 
-		IFQ_DEQUEUE(&ifp->if_snd, m_head);
+		m_head = ifq_dequeue(&ifp->if_snd);
 		if (m_head == NULL)
 			break;
 
diff --git a/sys/dev/pci/if_tl.c b/sys/dev/pci/if_tl.c
index c02973e91f7..df758ec328d 100644
--- a/sys/dev/pci/if_tl.c
+++ b/sys/dev/pci/if_tl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_tl.c,v 1.72 2020/01/05 01:07:58 jsg Exp $	*/
+/*	$OpenBSD: if_tl.c,v 1.73 2020/07/10 13:22:21 patrick Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998
@@ -1465,7 +1465,7 @@ tl_start(struct ifnet *ifp)
 	start_tx = sc->tl_cdata.tl_tx_free;
 
 	while(sc->tl_cdata.tl_tx_free != NULL) {
-		IFQ_DEQUEUE(&ifp->if_snd, m_head);
+		m_head = ifq_dequeue(&ifp->if_snd);
 		if (m_head == NULL)
 			break;
 
diff --git a/sys/dev/pci/if_vge.c b/sys/dev/pci/if_vge.c
index 09f118486e4..f035069dff2 100644
--- a/sys/dev/pci/if_vge.c
+++ b/sys/dev/pci/if_vge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_vge.c,v 1.72 2020/01/05 01:07:58 jsg Exp $	*/
+/*	$OpenBSD: if_vge.c,v 1.73 2020/07/10 13:22:21 patrick Exp $	*/
 /*	$FreeBSD: if_vge.c,v 1.3 2004/09/11 22:13:25 wpaul Exp $	*/
 /*
  * Copyright (c) 2004
@@ -1427,7 +1427,7 @@ vge_start(struct ifnet *ifp)
 			break;
 		}
 
-		IFQ_DEQUEUE(&ifp->if_snd, m_head);
+		m_head = ifq_dequeue(&ifp->if_snd);
 		if (m_head == NULL)
 			break;
 
diff --git a/sys/dev/pci/if_vr.c b/sys/dev/pci/if_vr.c
index 81a0f7ca2b4..98cd6de5e2c 100644
--- a/sys/dev/pci/if_vr.c
+++ b/sys/dev/pci/if_vr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_vr.c,v 1.154 2020/06/22 02:31:33 dlg Exp $	*/
+/*	$OpenBSD: if_vr.c,v 1.155 2020/07/10 13:22:21 patrick Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998
@@ -1318,7 +1318,7 @@ vr_start(struct ifnet *ifp)
 			break;
 		}
 
-		IFQ_DEQUEUE(&ifp->if_snd, m);
+		m = ifq_dequeue(&ifp->if_snd);
 		if (m == NULL)
 			break;
 
diff --git a/sys/dev/pci/if_vte.c b/sys/dev/pci/if_vte.c
index 497bc58aa27..291fb150d7b 100644
--- a/sys/dev/pci/if_vte.c
+++ b/sys/dev/pci/if_vte.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_vte.c,v 1.22 2018/11/09 14:14:31 claudio Exp $	*/
+/*	$OpenBSD: if_vte.c,v 1.23 2020/07/10 13:22:21 patrick Exp $	*/
 /*-
  * Copyright (c) 2010, Pyun YongHyeon <yongari@FreeBSD.org>
  * All rights reserved.
@@ -664,7 +664,7 @@ vte_start(struct ifnet *ifp)
 			ifq_set_oactive(&ifp->if_snd);
 			break;
 		}
-		IFQ_DEQUEUE(&ifp->if_snd, m_head);
+		m_head = ifq_dequeue(&ifp->if_snd);
 		if (m_head == NULL)
 			break;
 
diff --git a/sys/dev/pci/if_wb.c b/sys/dev/pci/if_wb.c
index 9ca33771bb2..20d74594fa3 100644
--- a/sys/dev/pci/if_wb.c
+++ b/sys/dev/pci/if_wb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wb.c,v 1.70 2019/04/01 06:01:07 naddy Exp $	*/
+/*	$OpenBSD: if_wb.c,v 1.71 2020/07/10 13:22:21 patrick Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998
@@ -1289,7 +1289,7 @@ void wb_start(ifp)
 	start_tx = sc->wb_cdata.wb_tx_free;
 
 	while(sc->wb_cdata.wb_tx_free->wb_mbuf == NULL) {
-		IFQ_DEQUEUE(&ifp->if_snd, m_head);
+		m_head = ifq_dequeue(&ifp->if_snd);
 		if (m_head == NULL)
 			break;
 
diff --git a/sys/dev/pci/if_wpi.c b/sys/dev/pci/if_wpi.c
index 7b95d900f4f..e6708c8106f 100644
--- a/sys/dev/pci/if_wpi.c
+++ b/sys/dev/pci/if_wpi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wpi.c,v 1.152 2020/06/03 11:37:39 jmatthew Exp $	*/
+/*	$OpenBSD: if_wpi.c,v 1.153 2020/07/10 13:22:21 patrick Exp $	*/
 
 /*-
  * Copyright (c) 2006-2008
@@ -1910,7 +1910,7 @@ wpi_start(struct ifnet *ifp)
 			break;
 
 		/* Encapsulate and send data frames. */
-		IFQ_DEQUEUE(&ifp->if_snd, m);
+		m = ifq_dequeue(&ifp->if_snd);
 		if (m == NULL)
 			break;
 #if NBPFILTER > 0
diff --git a/sys/dev/pcmcia/if_malo.c b/sys/dev/pcmcia/if_malo.c
index 775f8bad3a6..97ba6fba861 100644
--- a/sys/dev/pcmcia/if_malo.c
+++ b/sys/dev/pcmcia/if_malo.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: if_malo.c,v 1.95 2020/01/11 08:23:05 cheloha Exp $ */
+/*      $OpenBSD: if_malo.c,v 1.96 2020/07/10 13:22:21 patrick Exp $ */
 
 /*
  * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org>
@@ -977,7 +977,7 @@ cmalo_start(struct ifnet *ifp)
 	if (!(ifp->if_flags & IFF_RUNNING) || ifq_is_oactive(&ifp->if_snd))
 		return;
 
-	IFQ_DEQUEUE(&ifp->if_snd, m);
+	m = ifq_dequeue(&ifp->if_snd);
 	if (m == NULL)
 		return;
 
diff --git a/sys/dev/sbus/be.c b/sys/dev/sbus/be.c
index 97d51e70966..0569de5410c 100644
--- a/sys/dev/sbus/be.c
+++ b/sys/dev/sbus/be.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: be.c,v 1.42 2017/01/22 10:17:39 dlg Exp $	*/
+/*	$OpenBSD: be.c,v 1.43 2020/07/10 13:22:21 patrick Exp $	*/
 /*	$NetBSD: be.c,v 1.26 2001/03/20 15:39:20 pk Exp $	*/
 
 /*-
@@ -574,7 +574,7 @@ bestart(struct ifnet *ifp)
 	bix = sc->sc_rb.rb_tdhead;
 
 	for (;;) {
-		IFQ_DEQUEUE(&ifp->if_snd, m);
+		m = ifq_dequeue(&ifp->if_snd);
 		if (m == NULL)
 			break;
 
diff --git a/sys/dev/sbus/qe.c b/sys/dev/sbus/qe.c
index ca02307368f..982fe4207f6 100644
--- a/sys/dev/sbus/qe.c
+++ b/sys/dev/sbus/qe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qe.c,v 1.40 2017/01/22 10:17:39 dlg Exp $	*/
+/*	$OpenBSD: qe.c,v 1.41 2020/07/10 13:22:21 patrick Exp $	*/
 /*	$NetBSD: qe.c,v 1.16 2001/03/30 17:30:18 christos Exp $	*/
 
 /*-
@@ -446,7 +446,7 @@ qestart(ifp)
 	bix = sc->sc_rb.rb_tdhead;
 
 	for (;;) {
-		IFQ_DEQUEUE(&ifp->if_snd, m);
+		m = ifq_dequeue(&ifp->if_snd);
 		if (m == NULL)
 			break;
 
diff --git a/sys/dev/usb/if_athn_usb.c b/sys/dev/usb/if_athn_usb.c
index abdefe08dd0..097ce3ad0e9 100644
--- a/sys/dev/usb/if_athn_usb.c
+++ b/sys/dev/usb/if_athn_usb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_athn_usb.c,v 1.56 2020/04/27 08:21:35 stsp Exp $	*/
+/*	$OpenBSD: if_athn_usb.c,v 1.57 2020/07/10 13:22:21 patrick Exp $	*/
 
 /*-
  * Copyright (c) 2011 Damien Bergamini <damien.bergamini@free.fr>
@@ -2417,7 +2417,7 @@ athn_usb_start(struct ifnet *ifp)
 			break;
 
 		/* Encapsulate and send data frames. */
-		IFQ_DEQUEUE(&ifp->if_snd, m);
+		m = ifq_dequeue(&ifp->if_snd);
 		if (m == NULL)
 			break;
 #if NBPFILTER > 0
diff --git a/sys/dev/usb/if_atu.c b/sys/dev/usb/if_atu.c
index fee9f0d2ad3..32e71c3bf05 100644
--- a/sys/dev/usb/if_atu.c
+++ b/sys/dev/usb/if_atu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_atu.c,v 1.129 2020/06/16 09:41:21 jmatthew Exp $ */
+/*	$OpenBSD: if_atu.c,v 1.130 2020/07/10 13:22:21 patrick Exp $ */
 /*
  * Copyright (c) 2003, 2004
  *	Daan Vreeken <Danovitsch@Vitsch.net>.  All rights reserved.
@@ -1957,7 +1957,7 @@ atu_start(struct ifnet *ifp)
 				break;
 			}
 
-			IFQ_DEQUEUE(&ifp->if_snd, m);
+			m = ifq_dequeue(&ifp->if_snd);
 			if (m == NULL) {
 				DPRINTFN(25, ("%s: nothing to send\n",
 				    sc->atu_dev.dv_xname));
diff --git a/sys/dev/usb/if_otus.c b/sys/dev/usb/if_otus.c
index 644e88fca28..112676c139f 100644
--- a/sys/dev/usb/if_otus.c
+++ b/sys/dev/usb/if_otus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_otus.c,v 1.65 2019/11/12 07:47:30 mpi Exp $	*/
+/*	$OpenBSD: if_otus.c,v 1.66 2020/07/10 13:22:21 patrick Exp $	*/
 
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -1428,7 +1428,7 @@ otus_start(struct ifnet *ifp)
 			break;
 
 		/* Encapsulate and send data frames. */
-		IFQ_DEQUEUE(&ifp->if_snd, m);
+		m = ifq_dequeue(&ifp->if_snd);
 		if (m == NULL)
 			break;
 #if NBPFILTER > 0
diff --git a/sys/dev/usb/if_ral.c b/sys/dev/usb/if_ral.c
index 9d81664f824..f1f2d0e4471 100644
--- a/sys/dev/usb/if_ral.c
+++ b/sys/dev/usb/if_ral.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ral.c,v 1.146 2019/04/25 01:52:14 kevlo Exp $	*/
+/*	$OpenBSD: if_ral.c,v 1.147 2020/07/10 13:22:21 patrick Exp $	*/
 
 /*-
  * Copyright (c) 2005, 2006
@@ -1238,7 +1238,7 @@ ural_start(struct ifnet *ifp)
 			if (ic->ic_state != IEEE80211_S_RUN)
 				break;
 
-			IFQ_DEQUEUE(&ifp->if_snd, m0);
+			m0 = ifq_dequeue(&ifp->if_snd);
 			if (m0 == NULL)
 				break;
 #if NBPFILTER > 0
diff --git a/sys/dev/usb/if_rsu.c b/sys/dev/usb/if_rsu.c
index 5e0d0f3ce2e..94f41d623a5 100644
--- a/sys/dev/usb/if_rsu.c
+++ b/sys/dev/usb/if_rsu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_rsu.c,v 1.45 2019/09/12 12:55:07 stsp Exp $	*/
+/*	$OpenBSD: if_rsu.c,v 1.46 2020/07/10 13:22:21 patrick Exp $	*/
 
 /*-
  * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -1640,7 +1640,7 @@ rsu_start(struct ifnet *ifp)
 			break;
 
 		/* Encapsulate and send data frames. */
-		IFQ_DEQUEUE(&ifp->if_snd, m);
+		m = ifq_dequeue(&ifp->if_snd);
 		if (m == NULL)
 			break;
 #if NBPFILTER > 0
diff --git a/sys/dev/usb/if_rum.c b/sys/dev/usb/if_rum.c
index 7126aaa9540..1dada2fd1db 100644
--- a/sys/dev/usb/if_rum.c
+++ b/sys/dev/usb/if_rum.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_rum.c,v 1.124 2019/04/25 01:52:14 kevlo Exp $	*/
+/*	$OpenBSD: if_rum.c,v 1.125 2020/07/10 13:22:21 patrick Exp $	*/
 
 /*-
  * Copyright (c) 2005-2007 Damien Bergamini <damien.bergamini@free.fr>
@@ -1254,7 +1254,7 @@ rum_start(struct ifnet *ifp)
 			if (ic->ic_state != IEEE80211_S_RUN)
 				break;
 
-			IFQ_DEQUEUE(&ifp->if_snd, m0);
+			m0 = ifq_dequeue(&ifp->if_snd);
 			if (m0 == NULL)
 				break;
 #if NBPFILTER > 0
diff --git a/sys/dev/usb/if_run.c b/sys/dev/usb/if_run.c
index 7c1fe2c8ea3..76f4d1f42d6 100644
--- a/sys/dev/usb/if_run.c
+++ b/sys/dev/usb/if_run.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_run.c,v 1.128 2020/01/05 08:58:25 jsg Exp $	*/
+/*	$OpenBSD: if_run.c,v 1.129 2020/07/10 13:22:21 patrick Exp $	*/
 
 /*-
  * Copyright (c) 2008-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -2547,7 +2547,7 @@ run_start(struct ifnet *ifp)
 			break;
 
 		/* encapsulate and send data frames */
-		IFQ_DEQUEUE(&ifp->if_snd, m);
+		m = ifq_dequeue(&ifp->if_snd);
 		if (m == NULL)
 			break;
 #if NBPFILTER > 0
diff --git a/sys/dev/usb/if_uath.c b/sys/dev/usb/if_uath.c
index d597487ded5..ae047c6597c 100644
--- a/sys/dev/usb/if_uath.c
+++ b/sys/dev/usb/if_uath.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_uath.c,v 1.84 2019/11/12 07:47:30 mpi Exp $	*/
+/*	$OpenBSD: if_uath.c,v 1.85 2020/07/10 13:22:21 patrick Exp $	*/
 
 /*-
  * Copyright (c) 2006
@@ -1482,7 +1482,7 @@ uath_start(struct ifnet *ifp)
 			if (ic->ic_state != IEEE80211_S_RUN)
 				break;
 
-			IFQ_DEQUEUE(&ifp->if_snd, m0);
+			m0 = ifq_dequeue(&ifp->if_snd);
 			if (m0 == NULL)
 				break;
 #if NBPFILTER > 0
diff --git a/sys/dev/usb/if_upgt.c b/sys/dev/usb/if_upgt.c
index e985c5acd6e..493cfe787f8 100644
--- a/sys/dev/usb/if_upgt.c
+++ b/sys/dev/usb/if_upgt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_upgt.c,v 1.85 2020/01/04 11:35:03 mpi Exp $ */
+/*	$OpenBSD: if_upgt.c,v 1.86 2020/07/10 13:22:21 patrick Exp $ */
 
 /*
  * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org>
@@ -1377,7 +1377,7 @@ upgt_start(struct ifnet *ifp)
 			if (ic->ic_state != IEEE80211_S_RUN)
 				break;
 
-			IFQ_DEQUEUE(&ifp->if_snd, m);
+			m = ifq_dequeue(&ifp->if_snd);
 			if (m == NULL)
 				break;
 
diff --git a/sys/dev/usb/if_urtw.c b/sys/dev/usb/if_urtw.c
index 17d56c17423..4e9bfb114bc 100644
--- a/sys/dev/usb/if_urtw.c
+++ b/sys/dev/usb/if_urtw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_urtw.c,v 1.68 2019/06/14 11:57:16 kn Exp $	*/
+/*	$OpenBSD: if_urtw.c,v 1.69 2020/07/10 13:22:21 patrick Exp $	*/
 
 /*-
  * Copyright (c) 2009 Martynas Venckus <martynas@openbsd.org>
@@ -2440,7 +2440,7 @@ urtw_start(struct ifnet *ifp)
 		} else {
 			if (ic->ic_state != IEEE80211_S_RUN)
 				break;
-			IFQ_DEQUEUE(&ifp->if_snd, m0);
+			m0 = ifq_dequeue(&ifp->if_snd);
 			if (m0 == NULL)
 				break;
 #if NBPFILTER > 0
diff --git a/sys/dev/usb/if_zyd.c b/sys/dev/usb/if_zyd.c
index 0848a28542f..d2a1f89d009 100644
--- a/sys/dev/usb/if_zyd.c
+++ b/sys/dev/usb/if_zyd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_zyd.c,v 1.123 2020/04/02 17:36:32 stsp Exp $	*/
+/*	$OpenBSD: if_zyd.c,v 1.124 2020/07/10 13:22:21 patrick Exp $	*/
 
 /*-
  * Copyright (c) 2006 by Damien Bergamini <damien.bergamini@free.fr>
@@ -2251,7 +2251,7 @@ zyd_start(struct ifnet *ifp)
 			break;
 
 		/* encapsulate and send data frames */
-		IFQ_DEQUEUE(&ifp->if_snd, m);
+		m = ifq_dequeue(&ifp->if_snd);
 		if (m == NULL)
 			break;
 #if NBPFILTER > 0
diff --git a/sys/net/if_enc.c b/sys/net/if_enc.c
index e9b1b0b3fc2..ae020613240 100644
--- a/sys/net/if_enc.c
+++ b/sys/net/if_enc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_enc.c,v 1.76 2020/01/24 05:14:51 jsg Exp $	*/
+/*	$OpenBSD: if_enc.c,v 1.77 2020/07/10 13:22:22 patrick Exp $	*/
 
 /*
  * Copyright (c) 2010 Reyk Floeter <reyk@vantronix.net>
@@ -165,7 +165,7 @@ enc_start(struct ifnet *ifp)
 	struct mbuf	*m;
 
 	for (;;) {
-		IFQ_DEQUEUE(&ifp->if_snd, m);
+		m = ifq_dequeue(&ifp->if_snd);
 		if (m == NULL)
 			break;
 		m_freem(m);
diff --git a/sys/net/if_pair.c b/sys/net/if_pair.c
index 3d5c9a04e1f..a8c69c3f6f7 100644
--- a/sys/net/if_pair.c
+++ b/sys/net/if_pair.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_pair.c,v 1.13 2019/04/27 05:16:15 dlg Exp $	*/
+/*	$OpenBSD: if_pair.c,v 1.14 2020/07/10 13:22:22 patrick Exp $	*/
 
 /*
  * Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org>
@@ -169,7 +169,7 @@ pairstart(struct ifnet *ifp)
 	pairedifp = if_get(sc->sc_pairedif);
 
 	for (;;) {
-		IFQ_DEQUEUE(&ifp->if_snd, m);
+		m = ifq_dequeue(&ifp->if_snd);
 		if (m == NULL)
 			break;
 
diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c
index 19b486a50c3..9e2f9924de9 100644
--- a/sys/net/if_ppp.c
+++ b/sys/net/if_ppp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ppp.c,v 1.114 2020/06/24 22:03:42 cheloha Exp $	*/
+/*	$OpenBSD: if_ppp.c,v 1.115 2020/07/10 13:22:22 patrick Exp $	*/
 /*	$NetBSD: if_ppp.c,v 1.39 1997/05/17 21:11:59 christos Exp $	*/
 
 /*
@@ -768,7 +768,7 @@ pppoutput(struct ifnet *ifp, struct mbuf *m0, struct sockaddr *dst,
 		/* XXX we should limit the number of packets on this queue */
 		ml_enqueue(&sc->sc_npqueue, m0);
 	} else {
-		IFQ_ENQUEUE(&sc->sc_if.if_snd, m0, error);
+		error = ifq_enqueue(&sc->sc_if.if_snd, m0);
 		if (error) {
 			sc->sc_if.if_oerrors++;
 			sc->sc_stats.ppp_oerrors++;
@@ -811,7 +811,7 @@ ppp_requeue(struct ppp_softc *sc)
 
 		switch (mode) {
 		case NPMODE_PASS:
-			IFQ_ENQUEUE(&sc->sc_if.if_snd, m, error);
+			error = ifq_enqueue(&sc->sc_if.if_snd, m);
 			if (error) {
 				sc->sc_if.if_oerrors++;
 				sc->sc_stats.ppp_oerrors++;
@@ -858,7 +858,7 @@ ppp_dequeue(struct ppp_softc *sc)
 	 * Grab a packet to send: first try the fast queue, then the
 	 * normal queue.
 	 */
-	IFQ_DEQUEUE(&sc->sc_if.if_snd, m);
+	m = ifq_dequeue(&sc->sc_if.if_snd);
 	if (m == NULL)
 		return NULL;
 
diff --git a/sys/net/if_pppx.c b/sys/net/if_pppx.c
index 6550d6bf079..558b0f47b1a 100644
--- a/sys/net/if_pppx.c
+++ b/sys/net/if_pppx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_pppx.c,v 1.93 2020/07/10 11:45:08 mvs Exp $ */
+/*	$OpenBSD: if_pppx.c,v 1.94 2020/07/10 13:22:22 patrick Exp $ */
 
 /*
  * Copyright (c) 2010 Claudio Jeker <claudio@openbsd.org>
@@ -858,7 +858,7 @@ pppx_if_start(struct ifnet *ifp)
 		return;
 
 	for (;;) {
-		IFQ_DEQUEUE(&ifp->if_snd, m);
+		m = ifq_dequeue(&ifp->if_snd);
 
 		if (m == NULL)
 			break;
diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c
index 29af9375526..d28abdfd673 100644
--- a/sys/net/if_spppsubr.c
+++ b/sys/net/if_spppsubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_spppsubr.c,v 1.181 2019/11/13 10:15:10 bluhm Exp $	*/
+/*	$OpenBSD: if_spppsubr.c,v 1.182 2020/07/10 13:22:22 patrick Exp $	*/
 /*
  * Synchronous PPP link level subroutines.
  *
@@ -804,7 +804,7 @@ sppp_dequeue(struct ifnet *ifp)
 	 */
 	m = mq_dequeue(&sp->pp_cpq);
 	if (m == NULL && sppp_ncp_check(sp)) {
-		IFQ_DEQUEUE (&sp->pp_if.if_snd, m);
+		m = ifq_dequeue(&sp->pp_if.if_snd);
 	}
 	splx(s);
 	return m;
diff --git a/sys/net/if_switch.c b/sys/net/if_switch.c
index 3683044598c..362b4ad9179 100644
--- a/sys/net/if_switch.c
+++ b/sys/net/if_switch.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_switch.c,v 1.30 2019/11/06 03:51:26 dlg Exp $	*/
+/*	$OpenBSD: if_switch.c,v 1.31 2020/07/10 13:22:22 patrick Exp $	*/
 
 /*
  * Copyright (c) 2016 Kazuya GODA <goda@openbsd.org>
@@ -779,7 +779,7 @@ switch_port_ifb_start(struct ifnet *ifp)
 	struct mbuf_list	 ml = MBUF_LIST_INITIALIZER();
 
 	for (;;) {
-		IFQ_DEQUEUE(&ifp->if_snd, m);
+		m = ifq_dequeue(&ifp->if_snd);
 		if (m == NULL)
 			return;
 
diff --git a/sys/net/if_trunk.c b/sys/net/if_trunk.c
index 4f0995ef7dd..a19e0e0fc88 100644
--- a/sys/net/if_trunk.c
+++ b/sys/net/if_trunk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_trunk.c,v 1.146 2020/06/17 06:45:22 dlg Exp $	*/
+/*	$OpenBSD: if_trunk.c,v 1.147 2020/07/10 13:22:22 patrick Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org>
@@ -1009,7 +1009,7 @@ trunk_start(struct ifnet *ifp)
 	int error;
 
 	for (;;) {
-		IFQ_DEQUEUE(&ifp->if_snd, m);
+		m = ifq_dequeue(&ifp->if_snd);
 		if (m == NULL)
 			break;
 
diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index 084b0656d9d..8109032506d 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_tun.c,v 1.222 2020/05/13 00:48:06 dlg Exp $	*/
+/*	$OpenBSD: if_tun.c,v 1.223 2020/07/10 13:22:22 patrick Exp $	*/
 /*	$NetBSD: if_tun.c,v 1.24 1996/05/07 02:40:48 thorpej Exp $	*/
 
 /*
@@ -1060,7 +1060,7 @@ tun_start(struct ifnet *ifp)
 
 	splassert(IPL_NET);
 
-	if (IFQ_LEN(&ifp->if_snd))
+	if (ifq_len(&ifp->if_snd))
 		tun_wakeup(sc);
 }
 
diff --git a/sys/net/if_var.h b/sys/net/if_var.h
index 7b928ad7bba..13dee98bbff 100644
--- a/sys/net/if_var.h
+++ b/sys/net/if_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_var.h,v 1.106 2020/07/04 08:06:08 anton Exp $	*/
+/*	$OpenBSD: if_var.h,v 1.107 2020/07/10 13:22:22 patrick Exp $	*/
 /*	$NetBSD: if.h,v 1.23 1996/05/07 02:40:27 thorpej Exp $	*/
 
 /*
@@ -285,22 +285,11 @@ struct ifg_list {
  * IFQ compat on ifq API
  */
 
-#define	IFQ_ENQUEUE(ifq, m, err)					\
-do {									\
-	(err) = ifq_enqueue((ifq), (m));				\
-} while (/* CONSTCOND */0)
-
-#define	IFQ_DEQUEUE(ifq, m)						\
-do {									\
-	(m) = ifq_dequeue(ifq);						\
-} while (/* CONSTCOND */0)
-
 #define	IFQ_PURGE(ifq)							\
 do {									\
 	(void)ifq_purge(ifq);						\
 } while (/* CONSTCOND */0)
 
-#define	IFQ_LEN(ifq)			ifq_len(ifq)
 #define	IFQ_IS_EMPTY(ifq)		ifq_empty(ifq)
 #define	IFQ_SET_MAXLEN(ifq, len)	ifq_set_maxlen(ifq, len)
 
diff --git a/sys/net/if_vether.c b/sys/net/if_vether.c
index f3daf849dc2..4d39918ddf3 100644
--- a/sys/net/if_vether.c
+++ b/sys/net/if_vether.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_vether.c,v 1.30 2018/01/09 15:24:24 bluhm Exp $ */
+/* $OpenBSD: if_vether.c,v 1.31 2020/07/10 13:22:22 patrick Exp $ */
 
 /*
  * Copyright (c) 2009 Theo de Raadt
@@ -121,7 +121,7 @@ vetherstart(struct ifnet *ifp)
 	struct mbuf		*m;
 
 	for (;;) {
-		IFQ_DEQUEUE(&ifp->if_snd, m);
+		m = ifq_dequeue(&ifp->if_snd);
 		if (m == NULL)
 			return;
 
diff --git a/sys/net/if_vxlan.c b/sys/net/if_vxlan.c
index 2b95c235e48..e682d2761ab 100644
--- a/sys/net/if_vxlan.c
+++ b/sys/net/if_vxlan.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_vxlan.c,v 1.77 2020/04/12 11:56:52 mpi Exp $	*/
+/*	$OpenBSD: if_vxlan.c,v 1.78 2020/07/10 13:22:22 patrick Exp $	*/
 
 /*
  * Copyright (c) 2013 Reyk Floeter <reyk@openbsd.org>
@@ -314,7 +314,7 @@ vxlan_send_dispatch(void *xsc)
 
 	ml_init(&ml);
 	for (;;) {
-		IFQ_DEQUEUE(&ifp->if_snd, m);
+		m = ifq_dequeue(&ifp->if_snd);
 		if (m == NULL)
 			break;
 
diff --git a/sys/net80211/ieee80211_pae_output.c b/sys/net80211/ieee80211_pae_output.c
index 052fa25357e..35a00ff8b6b 100644
--- a/sys/net80211/ieee80211_pae_output.c
+++ b/sys/net80211/ieee80211_pae_output.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ieee80211_pae_output.c,v 1.31 2020/05/31 09:11:12 stsp Exp $	*/
+/*	$OpenBSD: ieee80211_pae_output.c,v 1.32 2020/07/10 13:22:22 patrick Exp $	*/
 
 /*-
  * Copyright (c) 2007,2008 Damien Bergamini <damien.bergamini@free.fr>
@@ -124,7 +124,7 @@ ieee80211_send_eapol_key(struct ieee80211com *ic, struct mbuf *m,
 		timeout_add_msec(&ni->ni_eapol_to, 100);
 #endif
 
-	IFQ_ENQUEUE(&ifp->if_snd, m, error);
+	error = ifq_enqueue(&ifp->if_snd, m);
 	if (error)
 		return (error);
 	if_start(ifp);