On Fri, Jul 10, 2020 at 12:20:53PM +0300, Vitaliy Makkoveev wrote:
>
>
> > On 10 Jul 2020, at 12:13, Patrick Wildt <patr...@blueri.se> wrote:
> >
> > Hi,
> >
> > this is a rather mechanical diff, done using vim and some regex,
> > to remove and replace IFQ_ENQUEUE, IFQ_DEQUEUE and IFQ_LEN.
> >
> > There are more, but I didn't want the diff to get too big. I'll
> > do that after this one is committed.
> >
> > ok?
> >
> > Patrick
>
> I guess ifq_enqueue(9) should also have ???.Dt ifq_enqueue 9??? instead
> of ???.Dt IFQ_ENQUEUE 9???.
No. .Dt is always uppercase. Look at printf(9), it has .Dt PRINTF but
there is no PRINTF().
> >
> > diff --git a/sys/arch/armv7/omap/if_cpsw.c b/sys/arch/armv7/omap/if_cpsw.c
> > index 3b380457e3f..7aee2730989 100644
> > --- a/sys/arch/armv7/omap/if_cpsw.c
> > +++ b/sys/arch/armv7/omap/if_cpsw.c
> > @@ -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..d65dcb879a1 100644
> > --- a/sys/arch/macppc/dev/if_bm.c
> > +++ b/sys/arch/macppc/dev/if_bm.c
> > @@ -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..00b2cb0aa88 100644
> > --- a/sys/arch/macppc/dev/if_mc.c
> > +++ b/sys/arch/macppc/dev/if_mc.c
> > @@ -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..a30b45dd2b6 100644
> > --- a/sys/arch/sparc64/dev/vnet.c
> > +++ b/sys/arch/sparc64/dev/vnet.c
> > @@ -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..8643dddee4e 100644
> > --- a/sys/dev/ic/acx.c
> > +++ b/sys/dev/ic/acx.c
> > @@ -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..08c10ada528 100644
> > --- a/sys/dev/ic/am7990.c
> > +++ b/sys/dev/ic/am7990.c
> > @@ -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..9af592e2f73 100644
> > --- a/sys/dev/ic/am79900.c
> > +++ b/sys/dev/ic/am79900.c
> > @@ -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..c469269eb4e 100644
> > --- a/sys/dev/ic/ath.c
> > +++ b/sys/dev/ic/ath.c
> > @@ -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..8384f583934 100644
> > --- a/sys/dev/ic/athn.c
> > +++ b/sys/dev/ic/athn.c
> > @@ -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..a6b676479ba 100644
> > --- a/sys/dev/ic/atw.c
> > +++ b/sys/dev/ic/atw.c
> > @@ -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..67d9dd33e6a 100644
> > --- a/sys/dev/ic/bwi.c
> > +++ b/sys/dev/ic/bwi.c
> > @@ -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/dp8390.c b/sys/dev/ic/dp8390.c
> > index 083100c51a3..01ebc12b138 100644
> > --- a/sys/dev/ic/dp8390.c
> > +++ b/sys/dev/ic/dp8390.c
> > @@ -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..8c44e1464ea 100644
> > --- a/sys/dev/ic/i82596.c
> > +++ b/sys/dev/ic/i82596.c
> > @@ -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..04ee06b1c68 100644
> > --- a/sys/dev/ic/if_wi.c
> > +++ b/sys/dev/ic/if_wi.c
> > @@ -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..f381f276b7d 100644
> > --- a/sys/dev/ic/malo.c
> > +++ b/sys/dev/ic/malo.c
> > @@ -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..e04f5136eae 100644
> > --- a/sys/dev/ic/mtd8xx.c
> > +++ b/sys/dev/ic/mtd8xx.c
> > @@ -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..7f3d7e0b325 100644
> > --- a/sys/dev/ic/rt2560.c
> > +++ b/sys/dev/ic/rt2560.c
> > @@ -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..845e67550e7 100644
> > --- a/sys/dev/ic/rt2661.c
> > +++ b/sys/dev/ic/rt2661.c
> > @@ -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..663259bdb91 100644
> > --- a/sys/dev/ic/rt2860.c
> > +++ b/sys/dev/ic/rt2860.c
> > @@ -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..f6a604651e8 100644
> > --- a/sys/dev/ic/rtl81x9.c
> > +++ b/sys/dev/ic/rtl81x9.c
> > @@ -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..a09248da3ca 100644
> > --- a/sys/dev/ic/rtwn.c
> > +++ b/sys/dev/ic/rtwn.c
> > @@ -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..7cabff123e5 100644
> > --- a/sys/dev/ic/xl.c
> > +++ b/sys/dev/ic/xl.c
> > @@ -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..d9e194b9d54 100644
> > --- a/sys/dev/isa/if_eg.c
> > +++ b/sys/dev/isa/if_eg.c
> > @@ -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..c1c73350d21 100644
> > --- a/sys/dev/isa/if_el.c
> > +++ b/sys/dev/isa/if_el.c
> > @@ -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..b4aaa2554c7 100644
> > --- a/sys/dev/isa/if_ie.c
> > +++ b/sys/dev/isa/if_ie.c
> > @@ -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..de0977bdc4f 100644
> > --- a/sys/dev/pci/if_age.c
> > +++ b/sys/dev/pci/if_age.c
> > @@ -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..3a4e108268c 100644
> > --- a/sys/dev/pci/if_alc.c
> > +++ b/sys/dev/pci/if_alc.c
> > @@ -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..969413641ea 100644
> > --- a/sys/dev/pci/if_ale.c
> > +++ b/sys/dev/pci/if_ale.c
> > @@ -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..2d6d980f360 100644
> > --- a/sys/dev/pci/if_bce.c
> > +++ b/sys/dev/pci/if_bce.c
> > @@ -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..c8f596cd252 100644
> > --- a/sys/dev/pci/if_cas.c
> > +++ b/sys/dev/pci/if_cas.c
> > @@ -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..e008d6b0b2b 100644
> > --- a/sys/dev/pci/if_et.c
> > +++ b/sys/dev/pci/if_et.c
> > @@ -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..233c6399cc0 100644
> > --- a/sys/dev/pci/if_ipw.c
> > +++ b/sys/dev/pci/if_ipw.c
> > @@ -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..fd50c6999dc 100644
> > --- a/sys/dev/pci/if_iwi.c
> > +++ b/sys/dev/pci/if_iwi.c
> > @@ -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..51e6189bc98 100644
> > --- a/sys/dev/pci/if_iwm.c
> > +++ b/sys/dev/pci/if_iwm.c
> > @@ -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..63c630e13a9 100644
> > --- a/sys/dev/pci/if_iwn.c
> > +++ b/sys/dev/pci/if_iwn.c
> > @@ -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..4bfdb4529e8 100644
> > --- a/sys/dev/pci/if_iwx.c
> > +++ b/sys/dev/pci/if_iwx.c
> > @@ -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..f04f4be009e 100644
> > --- a/sys/dev/pci/if_jme.c
> > +++ b/sys/dev/pci/if_jme.c
> > @@ -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..2d54a82e8b4 100644
> > --- a/sys/dev/pci/if_oce.c
> > +++ b/sys/dev/pci/if_oce.c
> > @@ -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..582cc7d26c9 100644
> > --- a/sys/dev/pci/if_ste.c
> > +++ b/sys/dev/pci/if_ste.c
> > @@ -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..fa62793976a 100644
> > --- a/sys/dev/pci/if_tl.c
> > +++ b/sys/dev/pci/if_tl.c
> > @@ -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..814aba45016 100644
> > --- a/sys/dev/pci/if_vge.c
> > +++ b/sys/dev/pci/if_vge.c
> > @@ -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..c7bda80f179 100644
> > --- a/sys/dev/pci/if_vr.c
> > +++ b/sys/dev/pci/if_vr.c
> > @@ -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..9c9f35e9a22 100644
> > --- a/sys/dev/pci/if_vte.c
> > +++ b/sys/dev/pci/if_vte.c
> > @@ -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..d6e749a59f1 100644
> > --- a/sys/dev/pci/if_wb.c
> > +++ b/sys/dev/pci/if_wb.c
> > @@ -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..af4513709b9 100644
> > --- a/sys/dev/pci/if_wpi.c
> > +++ b/sys/dev/pci/if_wpi.c
> > @@ -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..70da21aad9c 100644
> > --- a/sys/dev/pcmcia/if_malo.c
> > +++ b/sys/dev/pcmcia/if_malo.c
> > @@ -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..ccb9eb66e50 100644
> > --- a/sys/dev/sbus/be.c
> > +++ b/sys/dev/sbus/be.c
> > @@ -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..6f006c8c8c0 100644
> > --- a/sys/dev/sbus/qe.c
> > +++ b/sys/dev/sbus/qe.c
> > @@ -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..f6caa87dad1 100644
> > --- a/sys/dev/usb/if_athn_usb.c
> > +++ b/sys/dev/usb/if_athn_usb.c
> > @@ -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..d7ddd4a580c 100644
> > --- a/sys/dev/usb/if_atu.c
> > +++ b/sys/dev/usb/if_atu.c
> > @@ -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..0c27a4e29e0 100644
> > --- a/sys/dev/usb/if_otus.c
> > +++ b/sys/dev/usb/if_otus.c
> > @@ -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..324ebb93c33 100644
> > --- a/sys/dev/usb/if_ral.c
> > +++ b/sys/dev/usb/if_ral.c
> > @@ -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..252795c8ac0 100644
> > --- a/sys/dev/usb/if_rsu.c
> > +++ b/sys/dev/usb/if_rsu.c
> > @@ -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..f05bc6d4862 100644
> > --- a/sys/dev/usb/if_rum.c
> > +++ b/sys/dev/usb/if_rum.c
> > @@ -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..6e5dbb79aaf 100644
> > --- a/sys/dev/usb/if_run.c
> > +++ b/sys/dev/usb/if_run.c
> > @@ -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..423e781cbb5 100644
> > --- a/sys/dev/usb/if_uath.c
> > +++ b/sys/dev/usb/if_uath.c
> > @@ -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..1c7a222b6f5 100644
> > --- a/sys/dev/usb/if_upgt.c
> > +++ b/sys/dev/usb/if_upgt.c
> > @@ -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..d8aa1ad37bd 100644
> > --- a/sys/dev/usb/if_urtw.c
> > +++ b/sys/dev/usb/if_urtw.c
> > @@ -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..3a890d9e97c 100644
> > --- a/sys/dev/usb/if_zyd.c
> > +++ b/sys/dev/usb/if_zyd.c
> > @@ -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..f67c4b72d75 100644
> > --- a/sys/net/if_enc.c
> > +++ b/sys/net/if_enc.c
> > @@ -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..e8446ed721b 100644
> > --- a/sys/net/if_pair.c
> > +++ b/sys/net/if_pair.c
> > @@ -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..838e47f1e6b 100644
> > --- a/sys/net/if_ppp.c
> > +++ b/sys/net/if_ppp.c
> > @@ -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 97670b2af91..2ee5be0938d 100644
> > --- a/sys/net/if_pppx.c
> > +++ b/sys/net/if_pppx.c
> > @@ -885,7 +885,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..7dd1bf1274c 100644
> > --- a/sys/net/if_spppsubr.c
> > +++ b/sys/net/if_spppsubr.c
> > @@ -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..5bec2710770 100644
> > --- a/sys/net/if_switch.c
> > +++ b/sys/net/if_switch.c
> > @@ -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..49d246e8277 100644
> > --- a/sys/net/if_trunk.c
> > +++ b/sys/net/if_trunk.c
> > @@ -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..fcf275a1ea5 100644
> > --- a/sys/net/if_tun.c
> > +++ b/sys/net/if_tun.c
> > @@ -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..eb2b25ffad0 100644
> > --- a/sys/net/if_var.h
> > +++ b/sys/net/if_var.h
> > @@ -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..0dc12d95432 100644
> > --- a/sys/net/if_vether.c
> > +++ b/sys/net/if_vether.c
> > @@ -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..56b95e78060 100644
> > --- a/sys/net/if_vxlan.c
> > +++ b/sys/net/if_vxlan.c
> > @@ -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..1450e724d92 100644
> > --- a/sys/net80211/ieee80211_pae_output.c
> > +++ b/sys/net80211/ieee80211_pae_output.c
> > @@ -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);
> >
>
