Hi,
based on the previous diffs, this removes the last remaining users
of the compat API. IFQ_SET_MAXLEN is simply now lowercase, and
IFQ_IS_EMPTY is lowercase and got its _IS removed. Pretty mechanical
diff.
ok?
Patrick
diff --git a/sys/arch/armv7/omap/if_cpsw.c b/sys/arch/armv7/omap/if_cpsw.c
index 7aee2730989..829a061038c 100644
--- a/sys/arch/armv7/omap/if_cpsw.c
+++ b/sys/arch/armv7/omap/if_cpsw.c
@@ -448,7 +448,7 @@ cpsw_attach(struct device *parent, struct device *self,
void *aux)
ifp->if_start = cpsw_start;
ifp->if_ioctl = cpsw_ioctl;
ifp->if_watchdog = cpsw_watchdog;
- IFQ_SET_MAXLEN(&ifp->if_snd, CPSW_NTXDESCS - 1);
+ ifq_set_maxlen(&ifp->if_snd, CPSW_NTXDESCS - 1);
memcpy(ifp->if_xname, DEVNAME(sc), IFNAMSIZ);
cpsw_stop(ifp);
@@ -520,7 +520,7 @@ cpsw_start(struct ifnet *ifp)
if (!ISSET(ifp->if_flags, IFF_RUNNING) ||
ifq_is_oactive(&ifp->if_snd) ||
- IFQ_IS_EMPTY(&ifp->if_snd))
+ ifq_empty(&ifp->if_snd))
return;
if (sc->sc_txnext >= sc->sc_txhead)
diff --git a/sys/arch/armv7/sunxi/sxie.c b/sys/arch/armv7/sunxi/sxie.c
index c1c4259a783..4c4aa04a41d 100644
--- a/sys/arch/armv7/sunxi/sxie.c
+++ b/sys/arch/armv7/sunxi/sxie.c
@@ -267,7 +267,7 @@ sxie_attach(struct device *parent, struct device *self,
void *aux)
ifp->if_watchdog = sxie_watchdog;
ifp->if_capabilities = IFCAP_VLAN_MTU; /* XXX status check in recv? */
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
+ ifq_set_maxlen(&ifp->if_snd, IFQ_MAXLEN);
/* Initialize MII/media info. */
mii = &sc->sc_mii;
diff --git a/sys/arch/octeon/dev/if_cnmac.c b/sys/arch/octeon/dev/if_cnmac.c
index 4be44bf2c9e..194024eaec7 100644
--- a/sys/arch/octeon/dev/if_cnmac.c
+++ b/sys/arch/octeon/dev/if_cnmac.c
@@ -310,7 +310,7 @@ cnmac_attach(struct device *parent, struct device *self,
void *aux)
ifp->if_qstart = cnmac_start;
ifp->if_watchdog = cnmac_watchdog;
ifp->if_hardmtu = CNMAC_MAX_MTU;
- IFQ_SET_MAXLEN(&ifp->if_snd, max(GATHER_QUEUE_SIZE, IFQ_MAXLEN));
+ ifq_set_maxlen(&ifp->if_snd, max(GATHER_QUEUE_SIZE, IFQ_MAXLEN));
ifp->if_capabilities = IFCAP_VLAN_MTU | IFCAP_CSUM_TCPv4 |
IFCAP_CSUM_UDPv4 | IFCAP_CSUM_TCPv6 | IFCAP_CSUM_UDPv6;
diff --git a/sys/arch/sgi/dev/if_iec.c b/sys/arch/sgi/dev/if_iec.c
index 6408f16b62e..44c76142fd9 100644
--- a/sys/arch/sgi/dev/if_iec.c
+++ b/sys/arch/sgi/dev/if_iec.c
@@ -408,7 +408,7 @@ iec_attach(struct device *parent, struct device *self, void
*aux)
ifp->if_watchdog = iec_watchdog;
if_attach(ifp);
- IFQ_SET_MAXLEN(&ifp->if_snd, IEC_NTXDESC - 1);
+ ifq_set_maxlen(&ifp->if_snd, IEC_NTXDESC - 1);
ether_ifattach(ifp);
/* Establish interrupt handler. */
diff --git a/sys/arch/sgi/dev/if_mec.c b/sys/arch/sgi/dev/if_mec.c
index f8b18abcc16..5ae63517f10 100644
--- a/sys/arch/sgi/dev/if_mec.c
+++ b/sys/arch/sgi/dev/if_mec.c
@@ -460,7 +460,7 @@ mec_attach(struct device *parent, struct device *self, void
*aux)
ifp->if_watchdog = mec_watchdog;
if_attach(ifp);
- IFQ_SET_MAXLEN(&ifp->if_snd, MEC_NTXDESC - 1);
+ ifq_set_maxlen(&ifp->if_snd, MEC_NTXDESC - 1);
ether_ifattach(ifp);
/* Establish interrupt handler. */
diff --git a/sys/arch/sgi/hpc/if_sq.c b/sys/arch/sgi/hpc/if_sq.c
index 65716393dce..0a9b94062ce 100644
--- a/sys/arch/sgi/hpc/if_sq.c
+++ b/sys/arch/sgi/hpc/if_sq.c
@@ -362,7 +362,7 @@ sq_attach(struct device *parent, struct device *self, void
*aux)
ifp->if_flags = IFF_BROADCAST | IFF_MULTICAST;
if_attach(ifp);
- IFQ_SET_MAXLEN(&ifp->if_snd, SQ_NTXDESC - 1);
+ ifq_set_maxlen(&ifp->if_snd, SQ_NTXDESC - 1);
ether_ifattach(ifp);
if (haa->hpc_regs->revision == 3) {
diff --git a/sys/arch/sparc64/dev/vnet.c b/sys/arch/sparc64/dev/vnet.c
index a30b45dd2b6..084480151ff 100644
--- a/sys/arch/sparc64/dev/vnet.c
+++ b/sys/arch/sparc64/dev/vnet.c
@@ -314,7 +314,7 @@ vnet_attach(struct device *parent, struct device *self,
void *aux)
ifp->if_start = vnet_start;
ifp->if_watchdog = vnet_watchdog;
strlcpy(ifp->if_xname, sc->sc_dv.dv_xname, IFNAMSIZ);
- IFQ_SET_MAXLEN(&ifp->if_snd, 31); /* XXX */
+ ifq_set_maxlen(&ifp->if_snd, 31); /* XXX */
ifmedia_init(&sc->sc_media, 0, vnet_media_change, vnet_media_status);
ifmedia_add(&sc->sc_media, IFM_ETHER | IFM_AUTO, 0, NULL);
@@ -1087,7 +1087,7 @@ vnet_start(struct ifnet *ifp)
if (!(ifp->if_flags & IFF_RUNNING) || ifq_is_oactive(&ifp->if_snd))
return;
- if (IFQ_IS_EMPTY(&ifp->if_snd))
+ if (ifq_empty(&ifp->if_snd))
return;
/*
diff --git a/sys/dev/fdt/if_dwge.c b/sys/dev/fdt/if_dwge.c
index 0ca21490caf..f71ac4b5d85 100644
--- a/sys/dev/fdt/if_dwge.c
+++ b/sys/dev/fdt/if_dwge.c
@@ -392,7 +392,7 @@ dwge_attach(struct device *parent, struct device *self,
void *aux)
ifp->if_ioctl = dwge_ioctl;
ifp->if_start = dwge_start;
ifp->if_watchdog = dwge_watchdog;
- IFQ_SET_MAXLEN(&ifp->if_snd, DWGE_NTXDESC - 1);
+ ifq_set_maxlen(&ifp->if_snd, DWGE_NTXDESC - 1);
bcopy(sc->sc_dev.dv_xname, ifp->if_xname, IFNAMSIZ);
ifp->if_capabilities = IFCAP_VLAN_MTU;
@@ -540,7 +540,7 @@ dwge_start(struct ifnet *ifp)
return;
if (ifq_is_oactive(&ifp->if_snd))
return;
- if (IFQ_IS_EMPTY(&ifp->if_snd))
+ if (ifq_empty(&ifp->if_snd))
return;
if (!sc->sc_link)
return;
diff --git a/sys/dev/fdt/if_dwxe.c b/sys/dev/fdt/if_dwxe.c
index 6d70551a697..d6ebe193d18 100644
--- a/sys/dev/fdt/if_dwxe.c
+++ b/sys/dev/fdt/if_dwxe.c
@@ -434,7 +434,7 @@ dwxe_attach(struct device *parent, struct device *self,
void *aux)
ifp->if_ioctl = dwxe_ioctl;
ifp->if_start = dwxe_start;
ifp->if_watchdog = dwxe_watchdog;
- IFQ_SET_MAXLEN(&ifp->if_snd, DWXE_NTXDESC - 1);
+ ifq_set_maxlen(&ifp->if_snd, DWXE_NTXDESC - 1);
bcopy(sc->sc_dev.dv_xname, ifp->if_xname, IFNAMSIZ);
ifp->if_capabilities = IFCAP_VLAN_MTU;
@@ -594,7 +594,7 @@ dwxe_start(struct ifnet *ifp)
return;
if (ifq_is_oactive(&ifp->if_snd))
return;
- if (IFQ_IS_EMPTY(&ifp->if_snd))
+ if (ifq_empty(&ifp->if_snd))
return;
if (!sc->sc_link)
return;
diff --git a/sys/dev/fdt/if_fec.c b/sys/dev/fdt/if_fec.c
index 3324f9dd672..22238c0a17b 100644
--- a/sys/dev/fdt/if_fec.c
+++ b/sys/dev/fdt/if_fec.c
@@ -857,7 +857,7 @@ fec_start(struct ifnet *ifp)
return;
if (ifq_is_oactive(&ifp->if_snd))
return;
- if (IFQ_IS_EMPTY(&ifp->if_snd))
+ if (ifq_empty(&ifp->if_snd))
return;
idx = sc->sc_tx_prod;
@@ -1016,7 +1016,7 @@ fec_intr(void *arg)
fec_tx_proc(sc);
/* Try to transmit. */
- if (ifp->if_flags & IFF_RUNNING && !IFQ_IS_EMPTY(&ifp->if_snd))
+ if (ifp->if_flags & IFF_RUNNING && !ifq_empty(&ifp->if_snd))
fec_start(ifp);
return 1;
diff --git a/sys/dev/fdt/if_mvneta.c b/sys/dev/fdt/if_mvneta.c
index 79e436d6607..7c5f59d278d 100644
--- a/sys/dev/fdt/if_mvneta.c
+++ b/sys/dev/fdt/if_mvneta.c
@@ -621,7 +621,7 @@ mvneta_attach(struct device *parent, struct device *self,
void *aux)
ifp->if_capabilities &= ~IFCAP_CSUM_TCPv4;
#endif
- IFQ_SET_MAXLEN(&ifp->if_snd, max(MVNETA_TX_RING_CNT - 1, IFQ_MAXLEN));
+ ifq_set_maxlen(&ifp->if_snd, max(MVNETA_TX_RING_CNT - 1, IFQ_MAXLEN));
strlcpy(ifp->if_xname, sc->sc_dev.dv_xname, sizeof(ifp->if_xname));
/*
@@ -728,7 +728,7 @@ mvneta_intr(void *arg)
if (ic & MVNETA_PRXTXTI_RBICTAPQ(0))
mvneta_rx_proc(sc);
- if (!IFQ_IS_EMPTY(&ifp->if_snd))
+ if (!ifq_empty(&ifp->if_snd))
mvneta_start(ifp);
return 1;
@@ -747,7 +747,7 @@ mvneta_start(struct ifnet *ifp)
return;
if (ifq_is_oactive(&ifp->if_snd))
return;
- if (IFQ_IS_EMPTY(&ifp->if_snd))
+ if (ifq_empty(&ifp->if_snd))
return;
/* If Link is DOWN, can't start TX */
diff --git a/sys/dev/fdt/if_mvpp.c b/sys/dev/fdt/if_mvpp.c
index cf3083f4fb7..9896e7cee6c 100644
--- a/sys/dev/fdt/if_mvpp.c
+++ b/sys/dev/fdt/if_mvpp.c
@@ -1433,7 +1433,7 @@ mvpp2_port_attach(struct device *parent, struct device
*self, void *aux)
ifp->if_ioctl = mvpp2_ioctl;
ifp->if_start = mvpp2_start;
ifp->if_watchdog = mvpp2_watchdog;
- IFQ_SET_MAXLEN(&ifp->if_snd, MVPP2_NTXDESC - 1);
+ ifq_set_maxlen(&ifp->if_snd, MVPP2_NTXDESC - 1);
bcopy(sc->sc_dev.dv_xname, ifp->if_xname, IFNAMSIZ);
ifp->if_capabilities = IFCAP_VLAN_MTU;
@@ -1600,7 +1600,7 @@ mvpp2_start(struct ifnet *ifp)
return;
if (ifq_is_oactive(&ifp->if_snd))
return;
- if (IFQ_IS_EMPTY(&ifp->if_snd))
+ if (ifq_empty(&ifp->if_snd))
return;
if (!sc->sc_link)
return;
diff --git a/sys/dev/ic/acx.c b/sys/dev/ic/acx.c
index 8643dddee4e..e11ace2d2e3 100644
--- a/sys/dev/ic/acx.c
+++ b/sys/dev/ic/acx.c
@@ -284,7 +284,7 @@ acx_attach(struct acx_softc *sc)
ifp->if_watchdog = acx_watchdog;
ifp->if_flags = IFF_SIMPLEX | IFF_BROADCAST | IFF_MULTICAST;
strlcpy(ifp->if_xname, sc->sc_dev.dv_xname, IFNAMSIZ);
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
+ ifq_set_maxlen(&ifp->if_snd, IFQ_MAXLEN);
/* Set channels */
for (i = 1; i <= 14; ++i) {
diff --git a/sys/dev/ic/aic6915.c b/sys/dev/ic/aic6915.c
index 78239f2804c..991fec60aa3 100644
--- a/sys/dev/ic/aic6915.c
+++ b/sys/dev/ic/aic6915.c
@@ -289,7 +289,7 @@ sf_attach(struct sf_softc *sc)
ifp->if_ioctl = sf_ioctl;
ifp->if_start = sf_start;
ifp->if_watchdog = sf_watchdog;
- IFQ_SET_MAXLEN(&ifp->if_snd, SF_NTXDESC_MASK);
+ ifq_set_maxlen(&ifp->if_snd, SF_NTXDESC_MASK);
/*
* Attach the interface.
diff --git a/sys/dev/ic/an.c b/sys/dev/ic/an.c
index 421e5749ae5..8fa46aec76c 100644
--- a/sys/dev/ic/an.c
+++ b/sys/dev/ic/an.c
@@ -562,7 +562,7 @@ an_intr(void *arg)
if (ifq_is_oactive(&ifp->if_snd) == 0 &&
sc->sc_ic.ic_state == IEEE80211_S_RUN &&
- !IFQ_IS_EMPTY(&ifp->if_snd))
+ !ifq_empty(&ifp->if_snd))
an_start(ifp);
}
diff --git a/sys/dev/ic/ath.c b/sys/dev/ic/ath.c
index 47505b6b733..e9fa857670e 100644
--- a/sys/dev/ic/ath.c
+++ b/sys/dev/ic/ath.c
@@ -355,7 +355,7 @@ ath_attach(u_int16_t devid, struct ath_softc *sc)
#ifndef __OpenBSD__
ifp->if_stop = ath_stop; /* XXX */
#endif
- IFQ_SET_MAXLEN(&ifp->if_snd, ATH_TXBUF * ATH_TXDESC);
+ ifq_set_maxlen(&ifp->if_snd, ATH_TXBUF * ATH_TXDESC);
ic->ic_softc = sc;
ic->ic_newassoc = ath_newassoc;
diff --git a/sys/dev/ic/bcmgenet.c b/sys/dev/ic/bcmgenet.c
index 3da74eaf968..8162fd2999d 100644
--- a/sys/dev/ic/bcmgenet.c
+++ b/sys/dev/ic/bcmgenet.c
@@ -975,7 +975,7 @@ genet_attach(struct genet_softc *sc)
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
ifp->if_start = genet_start;
ifp->if_ioctl = genet_ioctl;
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
+ ifq_set_maxlen(&ifp->if_snd, IFQ_MAXLEN);
/* 802.1Q VLAN-sized frames are supported */
ifp->if_capabilities = IFCAP_VLAN_MTU;
diff --git a/sys/dev/ic/bwfm.c b/sys/dev/ic/bwfm.c
index 15f1bbfb510..3b28a787e7e 100644
--- a/sys/dev/ic/bwfm.c
+++ b/sys/dev/ic/bwfm.c
@@ -352,7 +352,7 @@ bwfm_start(struct ifnet *ifp)
return;
if (ifq_is_oactive(&ifp->if_snd))
return;
- if (IFQ_IS_EMPTY(&ifp->if_snd))
+ if (ifq_empty(&ifp->if_snd))
return;
/* TODO: return if no link? */
diff --git a/sys/dev/ic/bwi.c b/sys/dev/ic/bwi.c
index 67d9dd33e6a..fedc841188d 100644
--- a/sys/dev/ic/bwi.c
+++ b/sys/dev/ic/bwi.c
@@ -789,7 +789,7 @@ bwi_attach(struct bwi_softc *sc)
ifp->if_watchdog = bwi_watchdog;
ifp->if_flags = IFF_SIMPLEX | IFF_BROADCAST | IFF_MULTICAST;
strlcpy(ifp->if_xname, sc->sc_dev.dv_xname, IFNAMSIZ);
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
+ ifq_set_maxlen(&ifp->if_snd, IFQ_MAXLEN);
/* Get locale */
sc->sc_locale = __SHIFTOUT(bwi_read_sprom(sc, BWI_SPROM_CARD_INFO),
diff --git a/sys/dev/ic/dc.c b/sys/dev/ic/dc.c
index a63c430bee7..e7c51b6cb5f 100644
--- a/sys/dev/ic/dc.c
+++ b/sys/dev/ic/dc.c
@@ -1698,7 +1698,7 @@ hasmac:
ifp->if_ioctl = dc_ioctl;
ifp->if_start = dc_start;
ifp->if_watchdog = dc_watchdog;
- IFQ_SET_MAXLEN(&ifp->if_snd, DC_TX_LIST_CNT - 1);
+ ifq_set_maxlen(&ifp->if_snd, DC_TX_LIST_CNT - 1);
bcopy(sc->sc_dev.dv_xname, ifp->if_xname, IFNAMSIZ);
ifp->if_capabilities = IFCAP_VLAN_MTU;
@@ -2358,7 +2358,7 @@ dc_tick(void *xsc)
if (!sc->dc_link && mii->mii_media_status & IFM_ACTIVE &&
IFM_SUBTYPE(mii->mii_media_active) != IFM_NONE) {
sc->dc_link++;
- if (IFQ_IS_EMPTY(&ifp->if_snd) == 0)
+ if (ifq_empty(&ifp->if_snd) == 0)
dc_start(ifp);
}
@@ -2488,7 +2488,7 @@ dc_intr(void *arg)
/* Re-enable interrupts. */
CSR_WRITE_4(sc, DC_IMR, DC_INTRS);
- if (IFQ_IS_EMPTY(&ifp->if_snd) == 0)
+ if (ifq_empty(&ifp->if_snd) == 0)
dc_start(ifp);
return (claimed);
@@ -2959,7 +2959,7 @@ dc_watchdog(struct ifnet *ifp)
dc_init(sc);
- if (IFQ_IS_EMPTY(&ifp->if_snd) == 0)
+ if (ifq_empty(&ifp->if_snd) == 0)
dc_start(ifp);
}
diff --git a/sys/dev/ic/elink3.c b/sys/dev/ic/elink3.c
index 5b722b758c5..ceb293d68b3 100644
--- a/sys/dev/ic/elink3.c
+++ b/sys/dev/ic/elink3.c
@@ -334,7 +334,7 @@ epconfig(struct ep_softc *sc, u_short chipset, u_int8_t
*enaddr)
ifp->if_flags =
IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
/* 64 packets are around 100ms on 10Mbps */
- IFQ_SET_MAXLEN(&ifp->if_snd, 64);
+ ifq_set_maxlen(&ifp->if_snd, 64);
if_attach(ifp);
ether_ifattach(ifp);
diff --git a/sys/dev/ic/fxp.c b/sys/dev/ic/fxp.c
index 9041fbb8af8..5df30fb7411 100644
--- a/sys/dev/ic/fxp.c
+++ b/sys/dev/ic/fxp.c
@@ -429,7 +429,7 @@ fxp_attach(struct fxp_softc *sc, const char *intrstr)
ifp->if_ioctl = fxp_ioctl;
ifp->if_start = fxp_start;
ifp->if_watchdog = fxp_watchdog;
- IFQ_SET_MAXLEN(&ifp->if_snd, FXP_NTXCB - 1);
+ ifq_set_maxlen(&ifp->if_snd, FXP_NTXCB - 1);
ifp->if_capabilities = IFCAP_VLAN_MTU;
@@ -835,7 +835,7 @@ fxp_intr(void *arg)
ifp->if_timer = sc->sc_cbt_cnt ? 5 : 0;
sc->sc_cbt_cons = txs;
- if (!IFQ_IS_EMPTY(&ifp->if_snd)) {
+ if (!ifq_empty(&ifp->if_snd)) {
/*
* Try to start more packets transmitting.
*/
diff --git a/sys/dev/ic/gem.c b/sys/dev/ic/gem.c
index fc1480d14fe..cb363fc9178 100644
--- a/sys/dev/ic/gem.c
+++ b/sys/dev/ic/gem.c
@@ -222,7 +222,7 @@ gem_config(struct gem_softc *sc)
ifp->if_qstart = gem_start;
ifp->if_ioctl = gem_ioctl;
ifp->if_watchdog = gem_watchdog;
- IFQ_SET_MAXLEN(&ifp->if_snd, GEM_NTXDESC - 1);
+ ifq_set_maxlen(&ifp->if_snd, GEM_NTXDESC - 1);
ifp->if_capabilities = IFCAP_VLAN_MTU;
diff --git a/sys/dev/ic/if_wi.c b/sys/dev/ic/if_wi.c
index 04ee06b1c68..f98dfa5821a 100644
--- a/sys/dev/ic/if_wi.c
+++ b/sys/dev/ic/if_wi.c
@@ -512,7 +512,7 @@ wi_intr(void *vsc)
if (status == 0)
return (0);
- if (!IFQ_IS_EMPTY(&ifp->if_snd))
+ if (!ifq_empty(&ifp->if_snd))
wi_start(ifp);
return (1);
diff --git a/sys/dev/ic/malo.c b/sys/dev/ic/malo.c
index f381f276b7d..d67f7da5cae 100644
--- a/sys/dev/ic/malo.c
+++ b/sys/dev/ic/malo.c
@@ -347,7 +347,7 @@ malo_attach(struct malo_softc *sc)
ifp->if_watchdog = malo_watchdog;
ifp->if_flags = IFF_SIMPLEX | IFF_BROADCAST | IFF_MULTICAST;
strlcpy(ifp->if_xname, sc->sc_dev.dv_xname, IFNAMSIZ);
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
+ ifq_set_maxlen(&ifp->if_snd, IFQ_MAXLEN);
/* set supported rates */
ic->ic_sup_rates[IEEE80211_MODE_11B] = ieee80211_std_rateset_11b;
diff --git a/sys/dev/ic/mtd8xx.c b/sys/dev/ic/mtd8xx.c
index e04f5136eae..8fd597861c8 100644
--- a/sys/dev/ic/mtd8xx.c
+++ b/sys/dev/ic/mtd8xx.c
@@ -798,7 +798,7 @@ mtd_watchdog(struct ifnet *ifp)
mtd_init(ifp);
- if (!IFQ_IS_EMPTY(&ifp->if_snd))
+ if (!ifq_empty(&ifp->if_snd))
mtd_start(ifp);
}
@@ -851,7 +851,7 @@ mtd_intr(void *xsc)
/* Re-enable interrupts. */
CSR_WRITE_4(MTD_IMR, IMR_INTRS);
- if (!IFQ_IS_EMPTY(&ifp->if_snd))
+ if (!ifq_empty(&ifp->if_snd))
mtd_start(ifp);
return (claimed);
diff --git a/sys/dev/ic/pgt.c b/sys/dev/ic/pgt.c
index 40d8cfe1aea..0b2750074f8 100644
--- a/sys/dev/ic/pgt.c
+++ b/sys/dev/ic/pgt.c
@@ -1239,7 +1239,7 @@ pgt_intr(void *arg)
pgt_read_4(sc, PGT_REG_CTRL_STAT)));
}
- if (!IFQ_IS_EMPTY(&ifp->if_snd))
+ if (!ifq_empty(&ifp->if_snd))
pgt_start(ifp);
return (1);
@@ -1878,7 +1878,7 @@ pgt_net_attach(struct pgt_softc *sc)
ifp->if_flags = IFF_SIMPLEX | IFF_BROADCAST | IFF_MULTICAST;
strlcpy(ifp->if_xname, sc->sc_dev.dv_xname, IFNAMSIZ);
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
+ ifq_set_maxlen(&ifp->if_snd, IFQ_MAXLEN);
/*
* Set channels
@@ -2116,7 +2116,7 @@ pgt_start(struct ifnet *ifp)
* net80211 management queue.
*/
for (; sc->sc_dirtyq_count[PGT_QUEUE_DATA_LOW_TX] <
- PGT_QUEUE_FULL_THRESHOLD && !IFQ_IS_EMPTY(&ifp->if_snd);) {
+ PGT_QUEUE_FULL_THRESHOLD && !ifq_empty(&ifp->if_snd);) {
pd = TAILQ_FIRST(&sc->sc_freeq[PGT_QUEUE_DATA_LOW_TX]);
m = ifq_deq_begin(&ifp->if_snd);
if (m == NULL)
diff --git a/sys/dev/ic/re.c b/sys/dev/ic/re.c
index ce00fbc20da..9cac8e9529c 100644
--- a/sys/dev/ic/re.c
+++ b/sys/dev/ic/re.c
@@ -1008,7 +1008,7 @@ re_attach(struct rl_softc *sc, const char *intrstr)
ifp->if_qstart = re_start;
ifp->if_watchdog = re_watchdog;
ifp->if_hardmtu = sc->rl_max_mtu;
- IFQ_SET_MAXLEN(&ifp->if_snd, sc->rl_ldata.rl_tx_desc_cnt);
+ ifq_set_maxlen(&ifp->if_snd, sc->rl_ldata.rl_tx_desc_cnt);
ifp->if_capabilities = IFCAP_VLAN_MTU | IFCAP_CSUM_TCPv4 |
IFCAP_CSUM_UDPv4;
diff --git a/sys/dev/ic/rtl81x9.c b/sys/dev/ic/rtl81x9.c
index f6a604651e8..6af68983b5a 100644
--- a/sys/dev/ic/rtl81x9.c
+++ b/sys/dev/ic/rtl81x9.c
@@ -774,7 +774,7 @@ rl_intr(void *arg)
/* Re-enable interrupts. */
CSR_WRITE_2(sc, RL_IMR, RL_INTRS);
- if (!IFQ_IS_EMPTY(&ifp->if_snd))
+ if (!ifq_empty(&ifp->if_snd))
rl_start(ifp);
return (claimed);
diff --git a/sys/dev/ic/smc83c170.c b/sys/dev/ic/smc83c170.c
index 8811dd95783..dd50ce95cc6 100644
--- a/sys/dev/ic/smc83c170.c
+++ b/sys/dev/ic/smc83c170.c
@@ -278,7 +278,7 @@ epic_attach(struct epic_softc *sc, const char *intrstr)
ifp->if_ioctl = epic_ioctl;
ifp->if_start = epic_start;
ifp->if_watchdog = epic_watchdog;
- IFQ_SET_MAXLEN(&ifp->if_snd, EPIC_NTXDESC - 1);
+ ifq_set_maxlen(&ifp->if_snd, EPIC_NTXDESC - 1);
ifp->if_capabilities = IFCAP_VLAN_MTU;
diff --git a/sys/dev/ic/ti.c b/sys/dev/ic/ti.c
index 43653ca6631..3161b687532 100644
--- a/sys/dev/ic/ti.c
+++ b/sys/dev/ic/ti.c
@@ -1443,7 +1443,7 @@ ti_attach(struct ti_softc *sc)
ifp->if_start = ti_start;
ifp->if_watchdog = ti_watchdog;
ifp->if_hardmtu = TI_JUMBO_FRAMELEN - ETHER_HDR_LEN;
- IFQ_SET_MAXLEN(&ifp->if_snd, TI_TX_RING_CNT - 1);
+ ifq_set_maxlen(&ifp->if_snd, TI_TX_RING_CNT - 1);
bcopy(sc->sc_dv.dv_xname, ifp->if_xname, IFNAMSIZ);
ifp->if_capabilities = IFCAP_VLAN_MTU;
@@ -1737,7 +1737,7 @@ ti_intr(void *xsc)
/* Re-enable interrupts. */
CSR_WRITE_4(sc, TI_MB_HOSTINTR, 0);
- if (ifp->if_flags & IFF_RUNNING && !IFQ_IS_EMPTY(&ifp->if_snd))
+ if (ifp->if_flags & IFF_RUNNING && !ifq_empty(&ifp->if_snd))
ti_start(ifp);
return (1);
diff --git a/sys/dev/ic/xl.c b/sys/dev/ic/xl.c
index 7cabff123e5..ee23ca6e9f5 100644
--- a/sys/dev/ic/xl.c
+++ b/sys/dev/ic/xl.c
@@ -1467,7 +1467,7 @@ xl_intr(void *arg)
}
}
- if (!IFQ_IS_EMPTY(&ifp->if_snd))
+ if (!ifq_empty(&ifp->if_snd))
(*ifp->if_start)(ifp);
return (claimed);
@@ -2234,7 +2234,7 @@ xl_watchdog(struct ifnet *ifp)
xl_rxeof(sc);
xl_init(sc);
- if (!IFQ_IS_EMPTY(&ifp->if_snd))
+ if (!ifq_empty(&ifp->if_snd))
(*ifp->if_start)(ifp);
}
@@ -2462,7 +2462,7 @@ xl_attach(struct xl_softc *sc)
ifp->if_start = xl_start;
ifp->if_watchdog = xl_watchdog;
ifp->if_baudrate = 10000000;
- IFQ_SET_MAXLEN(&ifp->if_snd, XL_TX_LIST_CNT - 1);
+ ifq_set_maxlen(&ifp->if_snd, XL_TX_LIST_CNT - 1);
memcpy(ifp->if_xname, sc->sc_dev.dv_xname, IFNAMSIZ);
ifp->if_capabilities = IFCAP_VLAN_MTU;
diff --git a/sys/dev/isa/if_ex.c b/sys/dev/isa/if_ex.c
index 04f90e46213..6974ff2a867 100644
--- a/sys/dev/isa/if_ex.c
+++ b/sys/dev/isa/if_ex.c
@@ -590,7 +590,7 @@ ex_intr(void *arg)
* be sent, attempt to send more packets to the network card.
*/
- if (send_pkts && IFQ_IS_EMPTY(&ifp->if_snd) == 0)
+ if (send_pkts && ifq_empty(&ifp->if_snd) == 0)
ex_start(ifp);
#ifdef EX_DEBUG
exintr_count--;
diff --git a/sys/dev/pci/if_age.c b/sys/dev/pci/if_age.c
index de0977bdc4f..78843bdcad3 100644
--- a/sys/dev/pci/if_age.c
+++ b/sys/dev/pci/if_age.c
@@ -220,7 +220,7 @@ age_attach(struct device *parent, struct device *self, void
*aux)
ifp->if_ioctl = age_ioctl;
ifp->if_start = age_start;
ifp->if_watchdog = age_watchdog;
- IFQ_SET_MAXLEN(&ifp->if_snd, AGE_TX_RING_CNT - 1);
+ ifq_set_maxlen(&ifp->if_snd, AGE_TX_RING_CNT - 1);
bcopy(sc->age_eaddr, sc->sc_arpcom.ac_enaddr, ETHER_ADDR_LEN);
bcopy(sc->sc_dev.dv_xname, ifp->if_xname, IFNAMSIZ);
@@ -960,7 +960,7 @@ age_start(struct ifnet *ifp)
return;
if ((sc->age_flags & AGE_FLAG_LINK) == 0)
return;
- if (IFQ_IS_EMPTY(&ifp->if_snd))
+ if (ifq_empty(&ifp->if_snd))
return;
enq = 0;
diff --git a/sys/dev/pci/if_alc.c b/sys/dev/pci/if_alc.c
index 3a4e108268c..4ca9b7a3249 100644
--- a/sys/dev/pci/if_alc.c
+++ b/sys/dev/pci/if_alc.c
@@ -1382,7 +1382,7 @@ alc_attach(struct device *parent, struct device *self,
void *aux)
ifp->if_ioctl = alc_ioctl;
ifp->if_start = alc_start;
ifp->if_watchdog = alc_watchdog;
- IFQ_SET_MAXLEN(&ifp->if_snd, ALC_TX_RING_CNT - 1);
+ ifq_set_maxlen(&ifp->if_snd, ALC_TX_RING_CNT - 1);
bcopy(sc->alc_eaddr, sc->sc_arpcom.ac_enaddr, ETHER_ADDR_LEN);
bcopy(sc->sc_dev.dv_xname, ifp->if_xname, IFNAMSIZ);
@@ -1905,7 +1905,7 @@ alc_start(struct ifnet *ifp)
return;
if ((sc->alc_flags & ALC_FLAG_LINK) == 0)
return;
- if (IFQ_IS_EMPTY(&ifp->if_snd))
+ if (ifq_empty(&ifp->if_snd))
return;
for (;;) {
diff --git a/sys/dev/pci/if_ale.c b/sys/dev/pci/if_ale.c
index 969413641ea..5b572119065 100644
--- a/sys/dev/pci/if_ale.c
+++ b/sys/dev/pci/if_ale.c
@@ -499,7 +499,7 @@ ale_attach(struct device *parent, struct device *self, void
*aux)
ifp->if_ioctl = ale_ioctl;
ifp->if_start = ale_start;
ifp->if_watchdog = ale_watchdog;
- IFQ_SET_MAXLEN(&ifp->if_snd, ALE_TX_RING_CNT - 1);
+ ifq_set_maxlen(&ifp->if_snd, ALE_TX_RING_CNT - 1);
bcopy(sc->ale_eaddr, sc->sc_arpcom.ac_enaddr, ETHER_ADDR_LEN);
bcopy(sc->sc_dev.dv_xname, ifp->if_xname, IFNAMSIZ);
@@ -986,7 +986,7 @@ ale_start(struct ifnet *ifp)
return;
if ((sc->ale_flags & ALE_FLAG_LINK) == 0)
return;
- if (IFQ_IS_EMPTY(&ifp->if_snd))
+ if (ifq_empty(&ifp->if_snd))
return;
enq = 0;
diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c
index 75506f2fdb3..9f331369fa7 100644
--- a/sys/dev/pci/if_bge.c
+++ b/sys/dev/pci/if_bge.c
@@ -2999,7 +2999,7 @@ bge_attach(struct device *parent, struct device *self,
void *aux)
ifp->if_ioctl = bge_ioctl;
ifp->if_qstart = bge_start;
ifp->if_watchdog = bge_watchdog;
- IFQ_SET_MAXLEN(&ifp->if_snd, BGE_TX_RING_CNT - 1);
+ ifq_set_maxlen(&ifp->if_snd, BGE_TX_RING_CNT - 1);
DPRINTFN(5, ("bcopy\n"));
bcopy(sc->bge_dev.dv_xname, ifp->if_xname, IFNAMSIZ);
diff --git a/sys/dev/pci/if_bnx.c b/sys/dev/pci/if_bnx.c
index a672f14cd1b..09869316958 100644
--- a/sys/dev/pci/if_bnx.c
+++ b/sys/dev/pci/if_bnx.c
@@ -877,7 +877,7 @@ bnx_attachhook(struct device *self)
ifp->if_watchdog = bnx_watchdog;
ifp->if_hardmtu = BNX_MAX_JUMBO_ETHER_MTU_VLAN -
sizeof(struct ether_header);
- IFQ_SET_MAXLEN(&ifp->if_snd, USABLE_TX_BD - 1);
+ ifq_set_maxlen(&ifp->if_snd, USABLE_TX_BD - 1);
bcopy(sc->eaddr, sc->arpcom.ac_enaddr, ETHER_ADDR_LEN);
bcopy(sc->bnx_dev.dv_xname, ifp->if_xname, IFNAMSIZ);
@@ -5152,7 +5152,7 @@ bnx_intr(void *xsc)
/* Start moving packets again */
if (ifp->if_flags & IFF_RUNNING &&
- !IFQ_IS_EMPTY(&ifp->if_snd))
+ !ifq_empty(&ifp->if_snd))
ifq_start(&ifp->if_snd);
}
diff --git a/sys/dev/pci/if_bnxt.c b/sys/dev/pci/if_bnxt.c
index 934b125ca3f..1f55010959f 100644
--- a/sys/dev/pci/if_bnxt.c
+++ b/sys/dev/pci/if_bnxt.c
@@ -608,7 +608,7 @@ bnxt_attach(struct device *parent, struct device *self,
void *aux)
#if NVLAN > 0
ifp->if_capabilities |= IFCAP_VLAN_HWTAGGING;
#endif
- IFQ_SET_MAXLEN(&ifp->if_snd, 1024); /* ? */
+ ifq_set_maxlen(&ifp->if_snd, 1024); /* ? */
ifmedia_init(&sc->sc_media, IFM_IMASK, bnxt_media_change,
bnxt_media_status);
diff --git a/sys/dev/pci/if_cas.c b/sys/dev/pci/if_cas.c
index c8f596cd252..5ec2b820b0f 100644
--- a/sys/dev/pci/if_cas.c
+++ b/sys/dev/pci/if_cas.c
@@ -493,7 +493,7 @@ cas_config(struct cas_softc *sc)
ifp->if_start = cas_start;
ifp->if_ioctl = cas_ioctl;
ifp->if_watchdog = cas_watchdog;
- IFQ_SET_MAXLEN(&ifp->if_snd, CAS_NTXDESC - 1);
+ ifq_set_maxlen(&ifp->if_snd, CAS_NTXDESC - 1);
ifp->if_capabilities = IFCAP_VLAN_MTU;
@@ -1859,7 +1859,7 @@ cas_tint(struct cas_softc *sc, u_int32_t status)
if (used == 0)
ifp->if_timer = 0;
- if (!IFQ_IS_EMPTY(&ifp->if_snd)) {
+ if (!ifq_empty(&ifp->if_snd)) {
KERNEL_LOCK();
cas_start(ifp);
KERNEL_UNLOCK();
diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c
index 640d12b9daf..f9740be41bc 100644
--- a/sys/dev/pci/if_em.c
+++ b/sys/dev/pci/if_em.c
@@ -1935,7 +1935,7 @@ em_setup_interface(struct em_softc *sc)
ifp->if_watchdog = em_watchdog;
ifp->if_hardmtu =
sc->hw.max_frame_size - ETHER_HDR_LEN - ETHER_CRC_LEN;
- IFQ_SET_MAXLEN(&ifp->if_snd, sc->sc_tx_slots - 1);
+ ifq_set_maxlen(&ifp->if_snd, sc->sc_tx_slots - 1);
ifp->if_capabilities = IFCAP_VLAN_MTU;
diff --git a/sys/dev/pci/if_et.c b/sys/dev/pci/if_et.c
index e008d6b0b2b..a6b7a4320ac 100644
--- a/sys/dev/pci/if_et.c
+++ b/sys/dev/pci/if_et.c
@@ -245,7 +245,7 @@ et_attach(struct device *parent, struct device *self, void
*aux)
ifp->if_ioctl = et_ioctl;
ifp->if_start = et_start;
ifp->if_watchdog = et_watchdog;
- IFQ_SET_MAXLEN(&ifp->if_snd, ET_TX_NDESC);
+ ifq_set_maxlen(&ifp->if_snd, ET_TX_NDESC);
strlcpy(ifp->if_xname, sc->sc_dev.dv_xname, IFNAMSIZ);
ifp->if_capabilities = IFCAP_VLAN_MTU;
diff --git a/sys/dev/pci/if_iavf.c b/sys/dev/pci/if_iavf.c
index b6ac8aacf64..3406caf82cb 100644
--- a/sys/dev/pci/if_iavf.c
+++ b/sys/dev/pci/if_iavf.c
@@ -890,7 +890,7 @@ iavf_attach(struct device *parent, struct device *self,
void *aux)
if (ifp->if_hardmtu == 0)
ifp->if_hardmtu = IAVF_HARDMTU;
strlcpy(ifp->if_xname, DEVNAME(sc), IFNAMSIZ);
- IFQ_SET_MAXLEN(&ifp->if_snd, sc->sc_tx_ring_ndescs);
+ ifq_set_maxlen(&ifp->if_snd, sc->sc_tx_ring_ndescs);
ifp->if_capabilities = IFCAP_VLAN_MTU | IFCAP_VLAN_HWTAGGING;
#if 0
diff --git a/sys/dev/pci/if_ix.c b/sys/dev/pci/if_ix.c
index 9f621f18bcc..e4d8c1cad93 100644
--- a/sys/dev/pci/if_ix.c
+++ b/sys/dev/pci/if_ix.c
@@ -1867,7 +1867,7 @@ ixgbe_setup_interface(struct ix_softc *sc)
ifp->if_watchdog = ixgbe_watchdog;
ifp->if_hardmtu = IXGBE_MAX_FRAME_SIZE -
ETHER_HDR_LEN - ETHER_CRC_LEN;
- IFQ_SET_MAXLEN(&ifp->if_snd, sc->num_tx_desc - 1);
+ ifq_set_maxlen(&ifp->if_snd, sc->num_tx_desc - 1);
ifp->if_capabilities = IFCAP_VLAN_MTU;
diff --git a/sys/dev/pci/if_ixgb.c b/sys/dev/pci/if_ixgb.c
index 99e74146100..6445e0211bd 100644
--- a/sys/dev/pci/if_ixgb.c
+++ b/sys/dev/pci/if_ixgb.c
@@ -548,7 +548,7 @@ ixgb_intr(void *arg)
}
}
- if (ifp->if_flags & IFF_RUNNING && !IFQ_IS_EMPTY(&ifp->if_snd))
+ if (ifp->if_flags & IFF_RUNNING && !ifq_empty(&ifp->if_snd))
ixgb_start(ifp);
return (claimed);
@@ -1011,7 +1011,7 @@ ixgb_setup_interface(struct ixgb_softc *sc)
ifp->if_watchdog = ixgb_watchdog;
ifp->if_hardmtu =
IXGB_MAX_JUMBO_FRAME_SIZE - ETHER_HDR_LEN - ETHER_CRC_LEN;
- IFQ_SET_MAXLEN(&ifp->if_snd, sc->num_tx_desc - 1);
+ ifq_set_maxlen(&ifp->if_snd, sc->num_tx_desc - 1);
ifp->if_capabilities = IFCAP_VLAN_MTU;
diff --git a/sys/dev/pci/if_ixl.c b/sys/dev/pci/if_ixl.c
index ae8b8daf91f..13a48d73700 100644
--- a/sys/dev/pci/if_ixl.c
+++ b/sys/dev/pci/if_ixl.c
@@ -1915,7 +1915,7 @@ ixl_attach(struct device *parent, struct device *self,
void *aux)
ifp->if_watchdog = ixl_watchdog;
ifp->if_hardmtu = IXL_HARDMTU;
strlcpy(ifp->if_xname, DEVNAME(sc), IFNAMSIZ);
- IFQ_SET_MAXLEN(&ifp->if_snd, sc->sc_tx_ring_ndescs);
+ ifq_set_maxlen(&ifp->if_snd, sc->sc_tx_ring_ndescs);
ifp->if_capabilities = IFCAP_VLAN_MTU;
#if 0
diff --git a/sys/dev/pci/if_jme.c b/sys/dev/pci/if_jme.c
index f04f4be009e..b88024f2a5b 100644
--- a/sys/dev/pci/if_jme.c
+++ b/sys/dev/pci/if_jme.c
@@ -662,7 +662,7 @@ jme_attach(struct device *parent, struct device *self, void
*aux)
ifp->if_ioctl = jme_ioctl;
ifp->if_start = jme_start;
ifp->if_watchdog = jme_watchdog;
- IFQ_SET_MAXLEN(&ifp->if_snd, JME_TX_RING_CNT - 1);
+ ifq_set_maxlen(&ifp->if_snd, JME_TX_RING_CNT - 1);
strlcpy(ifp->if_xname, sc->sc_dev.dv_xname, IFNAMSIZ);
ifp->if_capabilities = IFCAP_VLAN_MTU | IFCAP_CSUM_IPv4 |
@@ -1205,7 +1205,7 @@ jme_start(struct ifnet *ifp)
return;
if ((sc->jme_flags & JME_FLAG_LINK) == 0)
return;
- if (IFQ_IS_EMPTY(&ifp->if_snd))
+ if (ifq_empty(&ifp->if_snd))
return;
for (;;) {
diff --git a/sys/dev/pci/if_lge.c b/sys/dev/pci/if_lge.c
index 0784367c62f..635f726415f 100644
--- a/sys/dev/pci/if_lge.c
+++ b/sys/dev/pci/if_lge.c
@@ -499,7 +499,7 @@ lge_attach(struct device *parent, struct device *self, void
*aux)
ifp->if_start = lge_start;
ifp->if_watchdog = lge_watchdog;
ifp->if_hardmtu = LGE_JUMBO_MTU;
- IFQ_SET_MAXLEN(&ifp->if_snd, LGE_TX_LIST_CNT - 1);
+ ifq_set_maxlen(&ifp->if_snd, LGE_TX_LIST_CNT - 1);
DPRINTFN(5, ("bcopy\n"));
bcopy(sc->sc_dv.dv_xname, ifp->if_xname, IFNAMSIZ);
@@ -814,7 +814,7 @@ lge_tick(void *xsc)
if (mii->mii_media_status & IFM_ACTIVE &&
IFM_SUBTYPE(mii->mii_media_active) != IFM_NONE) {
sc->lge_link++;
- if (!IFQ_IS_EMPTY(&ifp->if_snd))
+ if (!ifq_empty(&ifp->if_snd))
lge_start(ifp);
}
}
@@ -873,7 +873,7 @@ lge_intr(void *arg)
/* Re-enable interrupts. */
CSR_WRITE_4(sc, LGE_IMR, LGE_IMR_SETRST_CTL0|LGE_IMR_INTR_ENB);
- if (!IFQ_IS_EMPTY(&ifp->if_snd))
+ if (!ifq_empty(&ifp->if_snd))
lge_start(ifp);
return (claimed);
@@ -1227,7 +1227,7 @@ lge_watchdog(struct ifnet *ifp)
lge_reset(sc);
lge_init(sc);
- if (!IFQ_IS_EMPTY(&ifp->if_snd))
+ if (!ifq_empty(&ifp->if_snd))
lge_start(ifp);
}
diff --git a/sys/dev/pci/if_mcx.c b/sys/dev/pci/if_mcx.c
index 49778d78f37..f1646f7bbbc 100644
--- a/sys/dev/pci/if_mcx.c
+++ b/sys/dev/pci/if_mcx.c
@@ -2563,7 +2563,7 @@ mcx_attach(struct device *parent, struct device *self,
void *aux)
#if NVLAN > 0
ifp->if_capabilities |= IFCAP_VLAN_HWTAGGING;
#endif
- IFQ_SET_MAXLEN(&ifp->if_snd, 1024);
+ ifq_set_maxlen(&ifp->if_snd, 1024);
ifmedia_init(&sc->sc_media, IFM_IMASK, mcx_media_change,
mcx_media_status);
diff --git a/sys/dev/pci/if_msk.c b/sys/dev/pci/if_msk.c
index 95fd778440c..05597385a73 100644
--- a/sys/dev/pci/if_msk.c
+++ b/sys/dev/pci/if_msk.c
@@ -939,7 +939,7 @@ msk_attach(struct device *parent, struct device *self, void
*aux)
if (sc->sk_type != SK_YUKON_FE &&
sc->sk_type != SK_YUKON_FE_P)
ifp->if_hardmtu = SK_JUMBO_MTU;
- IFQ_SET_MAXLEN(&ifp->if_snd, MSK_TX_RING_CNT - 1);
+ ifq_set_maxlen(&ifp->if_snd, MSK_TX_RING_CNT - 1);
bcopy(sc_if->sk_dev.dv_xname, ifp->if_xname, IFNAMSIZ);
ifp->if_capabilities = IFCAP_VLAN_MTU;
diff --git a/sys/dev/pci/if_myx.c b/sys/dev/pci/if_myx.c
index e491726b4bf..b32f50fd403 100644
--- a/sys/dev/pci/if_myx.c
+++ b/sys/dev/pci/if_myx.c
@@ -512,7 +512,7 @@ myx_attachhook(struct device *self)
ifp->if_watchdog = myx_watchdog;
ifp->if_hardmtu = MYX_RXBIG_SIZE;
strlcpy(ifp->if_xname, DEVNAME(sc), IFNAMSIZ);
- IFQ_SET_MAXLEN(&ifp->if_snd, 1);
+ ifq_set_maxlen(&ifp->if_snd, 1);
ifp->if_capabilities = IFCAP_VLAN_MTU;
#if 0
@@ -1065,7 +1065,7 @@ myx_up(struct myx_softc *sc)
sc->sc_tx_ring_count = r / sizeof(struct myx_tx_desc);
sc->sc_tx_nsegs = min(16, sc->sc_tx_ring_count / 4); /* magic */
sc->sc_tx_count = 0;
- IFQ_SET_MAXLEN(&ifp->if_snd, sc->sc_tx_ring_count - 1);
+ ifq_set_maxlen(&ifp->if_snd, sc->sc_tx_ring_count - 1);
/* Allocate Interrupt Queue */
diff --git a/sys/dev/pci/if_nep.c b/sys/dev/pci/if_nep.c
index 72a6e3e328b..8c821844082 100644
--- a/sys/dev/pci/if_nep.c
+++ b/sys/dev/pci/if_nep.c
@@ -1876,7 +1876,7 @@ nep_start(struct ifnet *ifp)
return;
if (ifq_is_oactive(&ifp->if_snd))
return;
- if (IFQ_IS_EMPTY(&ifp->if_snd))
+ if (ifq_empty(&ifp->if_snd))
return;
idx = sc->sc_tx_prod;
diff --git a/sys/dev/pci/if_nfe.c b/sys/dev/pci/if_nfe.c
index baba17caeb0..75198497f46 100644
--- a/sys/dev/pci/if_nfe.c
+++ b/sys/dev/pci/if_nfe.c
@@ -320,7 +320,7 @@ nfe_attach(struct device *parent, struct device *self, void
*aux)
ifp->if_ioctl = nfe_ioctl;
ifp->if_start = nfe_start;
ifp->if_watchdog = nfe_watchdog;
- IFQ_SET_MAXLEN(&ifp->if_snd, NFE_IFQ_MAXLEN);
+ ifq_set_maxlen(&ifp->if_snd, NFE_IFQ_MAXLEN);
strlcpy(ifp->if_xname, sc->sc_dev.dv_xname, IFNAMSIZ);
ifp->if_capabilities = IFCAP_VLAN_MTU;
diff --git a/sys/dev/pci/if_nge.c b/sys/dev/pci/if_nge.c
index b2195e18e29..44a48156dcb 100644
--- a/sys/dev/pci/if_nge.c
+++ b/sys/dev/pci/if_nge.c
@@ -792,7 +792,7 @@ nge_attach(struct device *parent, struct device *self, void
*aux)
ifp->if_start = nge_start;
ifp->if_watchdog = nge_watchdog;
ifp->if_hardmtu = NGE_JUMBO_MTU;
- IFQ_SET_MAXLEN(&ifp->if_snd, NGE_TX_LIST_CNT - 1);
+ ifq_set_maxlen(&ifp->if_snd, NGE_TX_LIST_CNT - 1);
DPRINTFN(5, ("%s: bcopy\n", sc->sc_dv.dv_xname));
bcopy(sc->sc_dv.dv_xname, ifp->if_xname, IFNAMSIZ);
@@ -1218,7 +1218,7 @@ nge_tick(void *xsc)
DPRINTF(("%s: gigabit link up\n", sc->sc_dv.dv_xname));
sc->nge_link++;
- if (!IFQ_IS_EMPTY(&ifp->if_snd))
+ if (!ifq_empty(&ifp->if_snd))
nge_start(ifp);
} else {
mii_tick(mii);
@@ -1228,7 +1228,7 @@ nge_tick(void *xsc)
if (IFM_SUBTYPE(mii->mii_media_active) == IFM_1000_T)
DPRINTF(("%s: gigabit link up\n",
sc->sc_dv.dv_xname));
- if (!IFQ_IS_EMPTY(&ifp->if_snd))
+ if (!ifq_empty(&ifp->if_snd))
nge_start(ifp);
}
@@ -1310,7 +1310,7 @@ nge_intr(void *arg)
/* Re-enable interrupts. */
CSR_WRITE_4(sc, NGE_IER, 1);
- if (!IFQ_IS_EMPTY(&ifp->if_snd))
+ if (!ifq_empty(&ifp->if_snd))
nge_start(ifp);
/* Data LED off for TBI mode */
@@ -1849,7 +1849,7 @@ nge_watchdog(struct ifnet *ifp)
ifp->if_flags &= ~IFF_RUNNING;
nge_init(sc);
- if (!IFQ_IS_EMPTY(&ifp->if_snd))
+ if (!ifq_empty(&ifp->if_snd))
nge_start(ifp);
}
diff --git a/sys/dev/pci/if_nxe.c b/sys/dev/pci/if_nxe.c
index 8971b7a7b9d..a40c3022c1b 100644
--- a/sys/dev/pci/if_nxe.c
+++ b/sys/dev/pci/if_nxe.c
@@ -919,7 +919,7 @@ nxe_attach(struct device *parent, struct device *self, void
*aux)
ifp->if_watchdog = nxe_watchdog;
ifp->if_hardmtu = MCLBYTES - ETHER_HDR_LEN - ETHER_CRC_LEN;
strlcpy(ifp->if_xname, DEVNAME(sc), IFNAMSIZ);
- IFQ_SET_MAXLEN(&ifp->if_snd, 512); /* XXX */
+ ifq_set_maxlen(&ifp->if_snd, 512); /* XXX */
ifmedia_init(&sc->sc_media, 0, nxe_media_change, nxe_media_status);
ifmedia_add(&sc->sc_media, IFM_ETHER|IFM_AUTO, 0, NULL);
@@ -1308,7 +1308,7 @@ nxe_start(struct ifnet *ifp)
if (!ISSET(ifp->if_flags, IFF_RUNNING) ||
ifq_is_oactive(&ifp->if_snd) ||
- IFQ_IS_EMPTY(&ifp->if_snd))
+ ifq_empty(&ifp->if_snd))
return;
if (nxe_ring_writeable(nr, sc->sc_cmd_consumer_cur) < NXE_TXD_DESCS) {
diff --git a/sys/dev/pci/if_oce.c b/sys/dev/pci/if_oce.c
index 2d54a82e8b4..ecbbd9c6363 100644
--- a/sys/dev/pci/if_oce.c
+++ b/sys/dev/pci/if_oce.c
@@ -823,7 +823,7 @@ oce_attach_ifp(struct oce_softc *sc)
ifp->if_watchdog = oce_watchdog;
ifp->if_hardmtu = OCE_MAX_MTU;
ifp->if_softc = sc;
- IFQ_SET_MAXLEN(&ifp->if_snd, sc->sc_tx_ring_size - 1);
+ ifq_set_maxlen(&ifp->if_snd, sc->sc_tx_ring_size - 1);
ifp->if_capabilities = IFCAP_VLAN_MTU | IFCAP_CSUM_IPv4 |
IFCAP_CSUM_TCPv4 | IFCAP_CSUM_UDPv4;
diff --git a/sys/dev/pci/if_pcn.c b/sys/dev/pci/if_pcn.c
index 6d6c367f077..c523fc49b69 100644
--- a/sys/dev/pci/if_pcn.c
+++ b/sys/dev/pci/if_pcn.c
@@ -769,7 +769,7 @@ pcn_attach(struct device *parent, struct device *self, void
*aux)
ifp->if_ioctl = pcn_ioctl;
ifp->if_start = pcn_start;
ifp->if_watchdog = pcn_watchdog;
- IFQ_SET_MAXLEN(&ifp->if_snd, PCN_NTXDESC -1);
+ ifq_set_maxlen(&ifp->if_snd, PCN_NTXDESC -1);
/* Attach the interface. */
if_attach(ifp);
diff --git a/sys/dev/pci/if_rge.c b/sys/dev/pci/if_rge.c
index 5b3fff4f0ea..2fb89d08fd7 100644
--- a/sys/dev/pci/if_rge.c
+++ b/sys/dev/pci/if_rge.c
@@ -242,7 +242,7 @@ rge_attach(struct device *parent, struct device *self, void
*aux)
ifp->if_ioctl = rge_ioctl;
ifp->if_qstart = rge_start;
ifp->if_watchdog = rge_watchdog;
- IFQ_SET_MAXLEN(&ifp->if_snd, RGE_TX_LIST_CNT);
+ ifq_set_maxlen(&ifp->if_snd, RGE_TX_LIST_CNT);
ifp->if_hardmtu = RGE_JUMBO_MTU;
ifp->if_capabilities = IFCAP_VLAN_MTU | IFCAP_CSUM_IPv4 |
diff --git a/sys/dev/pci/if_se.c b/sys/dev/pci/if_se.c
index 33fcdb0f27a..d7cbd619a66 100644
--- a/sys/dev/pci/if_se.c
+++ b/sys/dev/pci/if_se.c
@@ -690,7 +690,7 @@ se_attach(struct device *parent, struct device *self, void
*aux)
ifp->if_ioctl = se_ioctl;
ifp->if_start = se_start;
ifp->if_watchdog = se_watchdog;
- IFQ_SET_MAXLEN(&ifp->if_snd, SE_TX_RING_CNT - 1);
+ ifq_set_maxlen(&ifp->if_snd, SE_TX_RING_CNT - 1);
bcopy(sc->sc_dev.dv_xname, ifp->if_xname, IFNAMSIZ);
ifp->if_capabilities = IFCAP_VLAN_MTU;
@@ -1041,7 +1041,7 @@ se_tick(void *xsc)
if ((sc->sc_flags & SE_FLAG_LINK) == 0) {
se_miibus_statchg(&sc->sc_dev);
if ((sc->sc_flags & SE_FLAG_LINK) != 0 &&
- !IFQ_IS_EMPTY(&ifp->if_snd))
+ !ifq_empty(&ifp->if_snd))
se_start(ifp);
}
splx(s);
@@ -1088,7 +1088,7 @@ se_intr(void *arg)
if ((ifp->if_flags & IFF_RUNNING) != 0) {
/* Re-enable interrupts */
CSR_WRITE_4(sc, IntrMask, SE_INTRS);
- if (!IFQ_IS_EMPTY(&ifp->if_snd))
+ if (!ifq_empty(&ifp->if_snd))
se_start(ifp);
}
@@ -1402,7 +1402,7 @@ se_watchdog(struct ifnet *ifp)
s = splnet();
se_init(ifp);
- if (!IFQ_IS_EMPTY(&ifp->if_snd))
+ if (!ifq_empty(&ifp->if_snd))
se_start(ifp);
splx(s);
}
diff --git a/sys/dev/pci/if_sis.c b/sys/dev/pci/if_sis.c
index 8860671c66a..defb8d77f8f 100644
--- a/sys/dev/pci/if_sis.c
+++ b/sys/dev/pci/if_sis.c
@@ -1185,7 +1185,7 @@ sis_attach(struct device *parent, struct device *self,
void *aux)
ifp->if_ioctl = sis_ioctl;
ifp->if_start = sis_start;
ifp->if_watchdog = sis_watchdog;
- IFQ_SET_MAXLEN(&ifp->if_snd, SIS_TX_LIST_CNT - 1);
+ ifq_set_maxlen(&ifp->if_snd, SIS_TX_LIST_CNT - 1);
bcopy(sc->sc_dev.dv_xname, ifp->if_xname, IFNAMSIZ);
ifp->if_hardmtu = 1518; /* determined experimentally on DP83815 */
@@ -1586,7 +1586,7 @@ sis_intr(void *arg)
*/
SIS_SETBIT(sc, SIS_CSR, SIS_CSR_RX_ENABLE);
- if (!IFQ_IS_EMPTY(&ifp->if_snd))
+ if (!ifq_empty(&ifp->if_snd))
sis_start(ifp);
return (1);
@@ -1966,7 +1966,7 @@ sis_watchdog(struct ifnet *ifp)
s = splnet();
sis_init(sc);
- if (!IFQ_IS_EMPTY(&ifp->if_snd))
+ if (!ifq_empty(&ifp->if_snd))
sis_start(ifp);
splx(s);
diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c
index 94507976ba5..f12facd8db4 100644
--- a/sys/dev/pci/if_sk.c
+++ b/sys/dev/pci/if_sk.c
@@ -998,7 +998,7 @@ sk_attach(struct device *parent, struct device *self, void
*aux)
ifp->if_start = sk_start;
ifp->if_watchdog = sk_watchdog;
ifp->if_hardmtu = SK_JUMBO_MTU;
- IFQ_SET_MAXLEN(&ifp->if_snd, SK_TX_RING_CNT - 1);
+ ifq_set_maxlen(&ifp->if_snd, SK_TX_RING_CNT - 1);
bcopy(sc_if->sk_dev.dv_xname, ifp->if_xname, IFNAMSIZ);
ifp->if_capabilities = IFCAP_VLAN_MTU;
@@ -1929,9 +1929,9 @@ sk_intr(void *xsc)
CSR_WRITE_4(sc, SK_IMR, sc->sk_intrmask);
- if (ifp0 != NULL && !IFQ_IS_EMPTY(&ifp0->if_snd))
+ if (ifp0 != NULL && !ifq_empty(&ifp0->if_snd))
sk_start(ifp0);
- if (ifp1 != NULL && !IFQ_IS_EMPTY(&ifp1->if_snd))
+ if (ifp1 != NULL && !ifq_empty(&ifp1->if_snd))
sk_start(ifp1);
return (claimed);
diff --git a/sys/dev/pci/if_ste.c b/sys/dev/pci/if_ste.c
index 582cc7d26c9..fc1e8662c48 100644
--- a/sys/dev/pci/if_ste.c
+++ b/sys/dev/pci/if_ste.c
@@ -592,7 +592,7 @@ ste_intr(void *xsc)
/* Re-enable interrupts */
CSR_WRITE_2(sc, STE_IMR, STE_INTRS);
- if (ifp->if_flags & IFF_RUNNING && !IFQ_IS_EMPTY(&ifp->if_snd))
+ if (ifp->if_flags & IFF_RUNNING && !ifq_empty(&ifp->if_snd))
ste_start(ifp);
return claimed;
@@ -786,7 +786,7 @@ ste_stats_update(void *xsc)
* otherwise we get stuck in the wrong link state
*/
ste_miibus_statchg((struct device *)sc);
- if (!IFQ_IS_EMPTY(&ifp->if_snd))
+ if (!ifq_empty(&ifp->if_snd))
ste_start(ifp);
}
}
@@ -900,7 +900,7 @@ ste_attach(struct device *parent, struct device *self, void
*aux)
ifp->if_ioctl = ste_ioctl;
ifp->if_start = ste_start;
ifp->if_watchdog = ste_watchdog;
- IFQ_SET_MAXLEN(&ifp->if_snd, STE_TX_LIST_CNT - 1);
+ ifq_set_maxlen(&ifp->if_snd, STE_TX_LIST_CNT - 1);
bcopy(sc->sc_dev.dv_xname, ifp->if_xname, IFNAMSIZ);
ifp->if_capabilities = IFCAP_VLAN_MTU;
@@ -1390,6 +1390,6 @@ ste_watchdog(struct ifnet *ifp)
ste_rxeof(sc);
ste_init(sc);
- if (!IFQ_IS_EMPTY(&ifp->if_snd))
+ if (!ifq_empty(&ifp->if_snd))
ste_start(ifp);
}
diff --git a/sys/dev/pci/if_stge.c b/sys/dev/pci/if_stge.c
index 155ed623341..bfa919afb30 100644
--- a/sys/dev/pci/if_stge.c
+++ b/sys/dev/pci/if_stge.c
@@ -361,7 +361,7 @@ stge_attach(struct device *parent, struct device *self,
void *aux)
#ifdef STGE_JUMBO
ifp->if_hardmtu = STGE_JUMBO_MTU;
#endif
- IFQ_SET_MAXLEN(&ifp->if_snd, STGE_NTXDESC - 1);
+ ifq_set_maxlen(&ifp->if_snd, STGE_NTXDESC - 1);
ifp->if_capabilities = IFCAP_VLAN_MTU;
diff --git a/sys/dev/pci/if_tht.c b/sys/dev/pci/if_tht.c
index a562222fcb8..e6d2b4fc51f 100644
--- a/sys/dev/pci/if_tht.c
+++ b/sys/dev/pci/if_tht.c
@@ -782,7 +782,7 @@ tht_attach(struct device *parent, struct device *self, void
*aux)
ifp->if_watchdog = tht_watchdog;
ifp->if_hardmtu = MCLBYTES - ETHER_HDR_LEN - ETHER_CRC_LEN; /* XXX */
strlcpy(ifp->if_xname, DEVNAME(sc), IFNAMSIZ);
- IFQ_SET_MAXLEN(&ifp->if_snd, 400);
+ ifq_set_maxlen(&ifp->if_snd, 400);
ifmedia_init(&sc->sc_media, 0, tht_media_change, tht_media_status);
ifmedia_add(&sc->sc_media, IFM_ETHER|IFM_AUTO, 0, NULL);
@@ -1099,7 +1099,7 @@ tht_start(struct ifnet *ifp)
return;
if (ifq_is_oactive(&ifp->if_snd))
return;
- if (IFQ_IS_EMPTY(&ifp->if_snd))
+ if (ifq_empty(&ifp->if_snd))
return;
if (tht_fifo_writable(sc, &sc->sc_txt) <= THT_FIFO_DESC_LEN)
diff --git a/sys/dev/pci/if_tl.c b/sys/dev/pci/if_tl.c
index fa62793976a..e4944b72207 100644
--- a/sys/dev/pci/if_tl.c
+++ b/sys/dev/pci/if_tl.c
@@ -1295,7 +1295,7 @@ tl_intr(void *xsc)
CMD_PUT(sc, TL_CMD_ACK | r | type);
}
- if (!IFQ_IS_EMPTY(&ifp->if_snd))
+ if (!ifq_empty(&ifp->if_snd))
tl_start(ifp);
return r;
@@ -1962,7 +1962,7 @@ tl_attach(struct device *parent, struct device *self,
void *aux)
ifp->if_ioctl = tl_ioctl;
ifp->if_start = tl_start;
ifp->if_watchdog = tl_watchdog;
- IFQ_SET_MAXLEN(&ifp->if_snd, TL_TX_LIST_CNT - 1);
+ ifq_set_maxlen(&ifp->if_snd, TL_TX_LIST_CNT - 1);
bcopy(sc->sc_dev.dv_xname, ifp->if_xname, IFNAMSIZ);
ifp->if_capabilities = IFCAP_VLAN_MTU;
diff --git a/sys/dev/pci/if_txp.c b/sys/dev/pci/if_txp.c
index 718b4b8e08a..42d62dad6ee 100644
--- a/sys/dev/pci/if_txp.c
+++ b/sys/dev/pci/if_txp.c
@@ -213,7 +213,7 @@ txp_attachhook(struct device *self)
ifp->if_start = txp_start;
ifp->if_watchdog = txp_watchdog;
ifp->if_baudrate = IF_Mbps(10);
- IFQ_SET_MAXLEN(&ifp->if_snd, TX_ENTRIES);
+ ifq_set_maxlen(&ifp->if_snd, TX_ENTRIES);
bcopy(sc->sc_dev.dv_xname, ifp->if_xname, IFNAMSIZ);
txp_capabilities(sc);
diff --git a/sys/dev/pci/if_vge.c b/sys/dev/pci/if_vge.c
index 814aba45016..74198f1763f 100644
--- a/sys/dev/pci/if_vge.c
+++ b/sys/dev/pci/if_vge.c
@@ -777,7 +777,7 @@ vge_attach(struct device *parent, struct device *self, void
*aux)
#ifdef VGE_JUMBO
ifp->if_hardmtu = VGE_JUMBO_MTU;
#endif
- IFQ_SET_MAXLEN(&ifp->if_snd, VGE_IFQ_MAXLEN);
+ ifq_set_maxlen(&ifp->if_snd, VGE_IFQ_MAXLEN);
ifp->if_capabilities = IFCAP_VLAN_MTU | IFCAP_CSUM_IPv4 |
IFCAP_CSUM_TCPv4 | IFCAP_CSUM_UDPv4;
@@ -1231,7 +1231,7 @@ vge_tick(void *xsc)
else
ifp->if_link_state = LINK_STATE_HALF_DUPLEX;
if_link_state_change(ifp);
- if (!IFQ_IS_EMPTY(&ifp->if_snd))
+ if (!ifq_empty(&ifp->if_snd))
vge_start(ifp);
}
}
@@ -1299,7 +1299,7 @@ vge_intr(void *arg)
/* Re-enable interrupts */
CSR_WRITE_1(sc, VGE_CRS3, VGE_CR3_INT_GMSK);
- if (!IFQ_IS_EMPTY(&ifp->if_snd))
+ if (!ifq_empty(&ifp->if_snd))
vge_start(ifp);
return (claimed);
@@ -1412,7 +1412,7 @@ vge_start(struct ifnet *ifp)
if (!sc->vge_link || ifq_is_oactive(&ifp->if_snd))
return;
- if (IFQ_IS_EMPTY(&ifp->if_snd))
+ if (ifq_empty(&ifp->if_snd))
return;
idx = sc->vge_ldata.vge_tx_prodidx;
diff --git a/sys/dev/pci/if_vic.c b/sys/dev/pci/if_vic.c
index 1b007a49512..6b199040af0 100644
--- a/sys/dev/pci/if_vic.c
+++ b/sys/dev/pci/if_vic.c
@@ -480,7 +480,7 @@ vic_attach(struct device *parent, struct device *self, void
*aux)
ifp->if_watchdog = vic_watchdog;
ifp->if_hardmtu = VIC_JUMBO_MTU;
strlcpy(ifp->if_xname, DEVNAME(sc), IFNAMSIZ);
- IFQ_SET_MAXLEN(&ifp->if_snd, sc->sc_ntxbuf - 1);
+ ifq_set_maxlen(&ifp->if_snd, sc->sc_ntxbuf - 1);
ifp->if_capabilities = IFCAP_VLAN_MTU;
@@ -1039,7 +1039,7 @@ vic_start(struct ifnet *ifp)
if (ifq_is_oactive(&ifp->if_snd))
return;
- if (IFQ_IS_EMPTY(&ifp->if_snd))
+ if (ifq_empty(&ifp->if_snd))
return;
sc = (struct vic_softc *)ifp->if_softc;
@@ -1161,7 +1161,7 @@ vic_watchdog(struct ifnet *ifp)
}
}
- if (!IFQ_IS_EMPTY(&ifp->if_snd))
+ if (!ifq_empty(&ifp->if_snd))
vic_start(ifp);
#endif
}
diff --git a/sys/dev/pci/if_vmx.c b/sys/dev/pci/if_vmx.c
index 07dba87e710..9d829d11d0f 100644
--- a/sys/dev/pci/if_vmx.c
+++ b/sys/dev/pci/if_vmx.c
@@ -371,7 +371,7 @@ vmxnet3_attach(struct device *parent, struct device *self,
void *aux)
if (sc->sc_ds->upt_features & UPT1_F_VLAN)
ifp->if_capabilities |= IFCAP_VLAN_HWTAGGING;
- IFQ_SET_MAXLEN(&ifp->if_snd, NTXDESC);
+ ifq_set_maxlen(&ifp->if_snd, NTXDESC);
ifmedia_init(&sc->sc_media, IFM_IMASK, vmxnet3_media_change,
vmxnet3_media_status);
diff --git a/sys/dev/pci/if_vr.c b/sys/dev/pci/if_vr.c
index c7bda80f179..cc3c9bb4548 100644
--- a/sys/dev/pci/if_vr.c
+++ b/sys/dev/pci/if_vr.c
@@ -1167,7 +1167,7 @@ vr_intr(void *arg)
}
}
- if (!IFQ_IS_EMPTY(&ifp->if_snd))
+ if (!ifq_empty(&ifp->if_snd))
vr_start(ifp);
return (claimed);
@@ -1584,7 +1584,7 @@ vr_watchdog(struct ifnet *ifp)
printf("%s: watchdog timeout\n", sc->sc_dev.dv_xname);
vr_init(sc);
- if (!IFQ_IS_EMPTY(&ifp->if_snd))
+ if (!ifq_empty(&ifp->if_snd))
vr_start(ifp);
}
diff --git a/sys/dev/pci/if_vte.c b/sys/dev/pci/if_vte.c
index 9c9f35e9a22..42e79079c4f 100644
--- a/sys/dev/pci/if_vte.c
+++ b/sys/dev/pci/if_vte.c
@@ -329,7 +329,7 @@ vte_attach(struct device *parent, struct device *self, void
*aux)
ifp->if_ioctl = vte_ioctl;
ifp->if_start = vte_start;
ifp->if_watchdog = vte_watchdog;
- IFQ_SET_MAXLEN(&ifp->if_snd, VTE_TX_RING_CNT - 1);
+ ifq_set_maxlen(&ifp->if_snd, VTE_TX_RING_CNT - 1);
bcopy(sc->vte_eaddr, sc->sc_arpcom.ac_enaddr, ETHER_ADDR_LEN);
bcopy(sc->sc_dev.dv_xname, ifp->if_xname, IFNAMSIZ);
@@ -710,7 +710,7 @@ vte_watchdog(struct ifnet *ifp)
ifp->if_oerrors++;
vte_init(ifp);
- if (!IFQ_IS_EMPTY(&ifp->if_snd))
+ if (!ifq_empty(&ifp->if_snd))
vte_start(ifp);
}
@@ -870,7 +870,7 @@ vte_intr(void *arg)
vte_txeof(sc);
if (status & MISR_EVENT_CNT_OFLOW)
vte_stats_update(sc);
- if (!IFQ_IS_EMPTY(&ifp->if_snd))
+ if (!ifq_empty(&ifp->if_snd))
vte_start(ifp);
if (--n > 0)
status = CSR_READ_2(sc, VTE_MISR);
diff --git a/sys/dev/pci/if_wb.c b/sys/dev/pci/if_wb.c
index d6e749a59f1..cdcfeca8a5b 100644
--- a/sys/dev/pci/if_wb.c
+++ b/sys/dev/pci/if_wb.c
@@ -784,7 +784,7 @@ wb_attach(parent, self, aux)
ifp->if_ioctl = wb_ioctl;
ifp->if_start = wb_start;
ifp->if_watchdog = wb_watchdog;
- IFQ_SET_MAXLEN(&ifp->if_snd, WB_TX_LIST_CNT - 1);
+ ifq_set_maxlen(&ifp->if_snd, WB_TX_LIST_CNT - 1);
bcopy(sc->sc_dev.dv_xname, ifp->if_xname, IFNAMSIZ);
@@ -1150,7 +1150,7 @@ int wb_intr(arg)
/* Re-enable interrupts. */
CSR_WRITE_4(sc, WB_IMR, WB_INTRS);
- if (!IFQ_IS_EMPTY(&ifp->if_snd)) {
+ if (!ifq_empty(&ifp->if_snd)) {
wb_start(ifp);
}
@@ -1569,7 +1569,7 @@ void wb_watchdog(ifp)
#endif
wb_init(sc);
- if (!IFQ_IS_EMPTY(&ifp->if_snd))
+ if (!ifq_empty(&ifp->if_snd))
wb_start(ifp);
return;
diff --git a/sys/dev/pci/if_xge.c b/sys/dev/pci/if_xge.c
index 4aa4e6a3c5a..71edbdceb59 100644
--- a/sys/dev/pci/if_xge.c
+++ b/sys/dev/pci/if_xge.c
@@ -679,7 +679,7 @@ xge_attach(struct device *parent, struct device *self, void
*aux)
ifp->if_ioctl = xge_ioctl;
ifp->if_start = xge_start;
ifp->if_hardmtu = XGE_MAX_MTU;
- IFQ_SET_MAXLEN(&ifp->if_snd, NTXDESCS - 1);
+ ifq_set_maxlen(&ifp->if_snd, NTXDESCS - 1);
ifp->if_capabilities = IFCAP_VLAN_MTU | IFCAP_CSUM_IPv4 |
IFCAP_CSUM_TCPv4 | IFCAP_CSUM_UDPv4;
diff --git a/sys/dev/pcmcia/if_xe.c b/sys/dev/pcmcia/if_xe.c
index eda8f9324e1..0bd871dfda5 100644
--- a/sys/dev/pcmcia/if_xe.c
+++ b/sys/dev/pcmcia/if_xe.c
@@ -718,7 +718,7 @@ xe_intr(arg)
}
/* Try to start more packets transmitting. */
- if (IFQ_IS_EMPTY(&ifp->if_snd) == 0)
+ if (ifq_empty(&ifp->if_snd) == 0)
xe_start(ifp);
/* Detected excessive collisions? */
diff --git a/sys/dev/pv/if_hvn.c b/sys/dev/pv/if_hvn.c
index 6d5e919b01c..9cce8ba7335 100644
--- a/sys/dev/pv/if_hvn.c
+++ b/sys/dev/pv/if_hvn.c
@@ -279,7 +279,7 @@ hvn_attach(struct device *parent, struct device *self, void
*aux)
#endif
}
- IFQ_SET_MAXLEN(&ifp->if_snd, HVN_TX_DESC - 1);
+ ifq_set_maxlen(&ifp->if_snd, HVN_TX_DESC - 1);
ifmedia_init(&sc->sc_media, IFM_IMASK, hvn_media_change,
hvn_media_status);
diff --git a/sys/dev/pv/if_vio.c b/sys/dev/pv/if_vio.c
index a96b96b68ba..baf15dfb4eb 100644
--- a/sys/dev/pv/if_vio.c
+++ b/sys/dev/pv/if_vio.c
@@ -592,7 +592,7 @@ vio_attach(struct device *parent, struct device *self, void
*aux)
ifp->if_capabilities = IFCAP_VLAN_MTU;
if (virtio_has_feature(vsc, VIRTIO_NET_F_CSUM))
ifp->if_capabilities |= IFCAP_CSUM_TCPv4|IFCAP_CSUM_UDPv4;
- IFQ_SET_MAXLEN(&ifp->if_snd, vsc->sc_vqs[1].vq_num - 1);
+ ifq_set_maxlen(&ifp->if_snd, vsc->sc_vqs[1].vq_num - 1);
ifmedia_init(&sc->sc_media, 0, vio_media_change, vio_media_status);
ifmedia_add(&sc->sc_media, IFM_ETHER | IFM_AUTO, 0, NULL);
ifmedia_set(&sc->sc_media, IFM_ETHER | IFM_AUTO);
@@ -723,7 +723,7 @@ vio_start(struct ifnet *ifp)
if (!(ifp->if_flags & IFF_RUNNING) || ifq_is_oactive(&ifp->if_snd))
return;
- if (IFQ_IS_EMPTY(&ifp->if_snd))
+ if (ifq_empty(&ifp->if_snd))
return;
again:
diff --git a/sys/dev/pv/if_xnf.c b/sys/dev/pv/if_xnf.c
index 75d29eb584e..b66ceb32a62 100644
--- a/sys/dev/pv/if_xnf.c
+++ b/sys/dev/pv/if_xnf.c
@@ -315,7 +315,7 @@ xnf_attach(struct device *parent, struct device *self, void
*aux)
if (sc->sc_caps & XNF_CAP_CSUM6)
ifp->if_capabilities |= IFCAP_CSUM_TCPv6 | IFCAP_CSUM_UDPv6;
- IFQ_SET_MAXLEN(&ifp->if_snd, XNF_TX_DESC - 1);
+ ifq_set_maxlen(&ifp->if_snd, XNF_TX_DESC - 1);
ifmedia_init(&sc->sc_media, IFM_IMASK, xnf_media_change,
xnf_media_status);
diff --git a/sys/dev/usb/if_atu.c b/sys/dev/usb/if_atu.c
index d7ddd4a580c..0a6ed0cebc3 100644
--- a/sys/dev/usb/if_atu.c
+++ b/sys/dev/usb/if_atu.c
@@ -2226,7 +2226,7 @@ atu_watchdog(struct ifnet *ifp)
}
}
- if (!IFQ_IS_EMPTY(&ifp->if_snd))
+ if (!ifq_empty(&ifp->if_snd))
atu_start(ifp);
splx(s);
diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c
index 39a2560e209..ce55d07f0fd 100644
--- a/sys/dev/usb/if_aue.c
+++ b/sys/dev/usb/if_aue.c
@@ -1114,7 +1114,7 @@ aue_txeof(struct usbd_xfer *xfer, void *priv, usbd_status
status)
m_freem(c->aue_mbuf);
c->aue_mbuf = NULL;
- if (IFQ_IS_EMPTY(&ifp->if_snd) == 0)
+ if (ifq_empty(&ifp->if_snd) == 0)
aue_start(ifp);
splx(s);
@@ -1163,7 +1163,7 @@ aue_tick_task(void *xsc)
DPRINTFN(2,("%s: %s: got link\n",
sc->aue_dev.dv_xname,__func__));
sc->aue_link++;
- if (IFQ_IS_EMPTY(&ifp->if_snd) == 0)
+ if (ifq_empty(&ifp->if_snd) == 0)
aue_start(ifp);
}
@@ -1488,7 +1488,7 @@ aue_watchdog(struct ifnet *ifp)
usbd_get_xfer_status(c->aue_xfer, NULL, NULL, NULL, &stat);
aue_txeof(c->aue_xfer, c, stat);
- if (IFQ_IS_EMPTY(&ifp->if_snd) == 0)
+ if (ifq_empty(&ifp->if_snd) == 0)
aue_start(ifp);
splx(s);
}
diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c
index 5746952f326..40ecc7d8c6c 100644
--- a/sys/dev/usb/if_axe.c
+++ b/sys/dev/usb/if_axe.c
@@ -1123,7 +1123,7 @@ axe_txeof(struct usbd_xfer *xfer, void *priv, usbd_status
status)
m_freem(c->axe_mbuf);
c->axe_mbuf = NULL;
- if (IFQ_IS_EMPTY(&ifp->if_snd) == 0)
+ if (ifq_empty(&ifp->if_snd) == 0)
axe_start(ifp);
splx(s);
@@ -1446,7 +1446,7 @@ axe_watchdog(struct ifnet *ifp)
usbd_get_xfer_status(c->axe_xfer, NULL, NULL, NULL, &stat);
axe_txeof(c->axe_xfer, c, stat);
- if (!IFQ_IS_EMPTY(&ifp->if_snd))
+ if (!ifq_empty(&ifp->if_snd))
axe_start(ifp);
splx(s);
}
diff --git a/sys/dev/usb/if_axen.c b/sys/dev/usb/if_axen.c
index c19e87fe5ff..59af96e98ca 100644
--- a/sys/dev/usb/if_axen.c
+++ b/sys/dev/usb/if_axen.c
@@ -1083,7 +1083,7 @@ axen_txeof(struct usbd_xfer *xfer, void *priv,
usbd_status status)
m_freem(c->axen_mbuf);
c->axen_mbuf = NULL;
- if (IFQ_IS_EMPTY(&ifp->if_snd) == 0)
+ if (ifq_empty(&ifp->if_snd) == 0)
axen_start(ifp);
splx(s);
@@ -1399,7 +1399,7 @@ axen_watchdog(struct ifnet *ifp)
usbd_get_xfer_status(c->axen_xfer, NULL, NULL, NULL, &stat);
axen_txeof(c->axen_xfer, c, stat);
- if (!IFQ_IS_EMPTY(&ifp->if_snd))
+ if (!ifq_empty(&ifp->if_snd))
axen_start(ifp);
splx(s);
}
diff --git a/sys/dev/usb/if_cdce.c b/sys/dev/usb/if_cdce.c
index 6bb73bbfaca..46dea169845 100644
--- a/sys/dev/usb/if_cdce.c
+++ b/sys/dev/usb/if_cdce.c
@@ -812,7 +812,7 @@ cdce_txeof(struct usbd_xfer *xfer, void *priv, usbd_status
status)
if (err)
ifp->if_oerrors++;
- if (IFQ_IS_EMPTY(&ifp->if_snd) == 0)
+ if (ifq_empty(&ifp->if_snd) == 0)
cdce_start(ifp);
splx(s);
diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c
index 804b1ecef45..34fff75b27e 100644
--- a/sys/dev/usb/if_cue.c
+++ b/sys/dev/usb/if_cue.c
@@ -773,7 +773,7 @@ cue_txeof(struct usbd_xfer *xfer, void *priv, usbd_status
status)
m_freem(c->cue_mbuf);
c->cue_mbuf = NULL;
- if (IFQ_IS_EMPTY(&ifp->if_snd) == 0)
+ if (ifq_empty(&ifp->if_snd) == 0)
cue_start(ifp);
splx(s);
@@ -1100,7 +1100,7 @@ cue_watchdog(struct ifnet *ifp)
usbd_get_xfer_status(c->cue_xfer, NULL, NULL, NULL, &stat);
cue_txeof(c->cue_xfer, c, stat);
- if (IFQ_IS_EMPTY(&ifp->if_snd) == 0)
+ if (ifq_empty(&ifp->if_snd) == 0)
cue_start(ifp);
splx(s);
}
diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c
index 3306aad26b0..bdae18c77ec 100644
--- a/sys/dev/usb/if_kue.c
+++ b/sys/dev/usb/if_kue.c
@@ -788,7 +788,7 @@ kue_txeof(struct usbd_xfer *xfer, void *priv, usbd_status
status)
m_freem(c->kue_mbuf);
c->kue_mbuf = NULL;
- if (IFQ_IS_EMPTY(&ifp->if_snd) == 0)
+ if (ifq_empty(&ifp->if_snd) == 0)
kue_start(ifp);
splx(s);
@@ -1073,7 +1073,7 @@ kue_watchdog(struct ifnet *ifp)
usbd_get_xfer_status(c->kue_xfer, NULL, NULL, NULL, &stat);
kue_txeof(c->kue_xfer, c, stat);
- if (IFQ_IS_EMPTY(&ifp->if_snd) == 0)
+ if (ifq_empty(&ifp->if_snd) == 0)
kue_start(ifp);
splx(s);
}
diff --git a/sys/dev/usb/if_mos.c b/sys/dev/usb/if_mos.c
index 033e47fa648..2f4f47af2a2 100644
--- a/sys/dev/usb/if_mos.c
+++ b/sys/dev/usb/if_mos.c
@@ -1012,7 +1012,7 @@ mos_txeof(struct usbd_xfer *xfer, void *priv, usbd_status
status)
m_freem(c->mos_mbuf);
c->mos_mbuf = NULL;
- if (IFQ_IS_EMPTY(&ifp->if_snd) == 0)
+ if (ifq_empty(&ifp->if_snd) == 0)
mos_start(ifp);
splx(s);
@@ -1067,7 +1067,7 @@ mos_tick_task(void *xsc)
DPRINTF(("%s: %s: got link\n",
sc->mos_dev.dv_xname, __func__));
sc->mos_link++;
- if (IFQ_IS_EMPTY(&ifp->if_snd) == 0)
+ if (ifq_empty(&ifp->if_snd) == 0)
mos_start(ifp);
}
@@ -1306,7 +1306,7 @@ mos_watchdog(struct ifnet *ifp)
usbd_get_xfer_status(c->mos_xfer, NULL, NULL, NULL, &stat);
mos_txeof(c->mos_xfer, c, stat);
- if (!IFQ_IS_EMPTY(&ifp->if_snd))
+ if (!ifq_empty(&ifp->if_snd))
mos_start(ifp);
splx(s);
}
diff --git a/sys/dev/usb/if_mue.c b/sys/dev/usb/if_mue.c
index 599dccce10c..4efb50f1c40 100644
--- a/sys/dev/usb/if_mue.c
+++ b/sys/dev/usb/if_mue.c
@@ -1169,7 +1169,7 @@ mue_txeof(struct usbd_xfer *xfer, void *priv, usbd_status
status)
m_freem(c->mue_mbuf);
c->mue_mbuf = NULL;
- if (IFQ_IS_EMPTY(&ifp->if_snd) == 0)
+ if (ifq_empty(&ifp->if_snd) == 0)
mue_start(ifp);
splx(s);
@@ -1282,7 +1282,7 @@ mue_watchdog(struct ifnet *ifp)
usbd_get_xfer_status(c->mue_xfer, NULL, NULL, NULL, &stat);
mue_txeof(c->mue_xfer, c, stat);
- if (!IFQ_IS_EMPTY(&ifp->if_snd))
+ if (!ifq_empty(&ifp->if_snd))
mue_start(ifp);
splx(s);
}
diff --git a/sys/dev/usb/if_smsc.c b/sys/dev/usb/if_smsc.c
index ab628ad84f2..5fc2739a07f 100644
--- a/sys/dev/usb/if_smsc.c
+++ b/sys/dev/usb/if_smsc.c
@@ -1298,7 +1298,7 @@ smsc_txeof(struct usbd_xfer *xfer, void *priv,
usbd_status status)
m_freem(c->sc_mbuf);
c->sc_mbuf = NULL;
- if (IFQ_IS_EMPTY(&ifp->if_snd) == 0)
+ if (ifq_empty(&ifp->if_snd) == 0)
smsc_start(ifp);
splx(s);
diff --git a/sys/dev/usb/if_udav.c b/sys/dev/usb/if_udav.c
index 85623a64bc9..94e94107af3 100644
--- a/sys/dev/usb/if_udav.c
+++ b/sys/dev/usb/if_udav.c
@@ -1028,7 +1028,7 @@ udav_txeof(struct usbd_xfer *xfer, void *priv,
usbd_status status)
m_freem(c->udav_mbuf);
c->udav_mbuf = NULL;
- if (IFQ_IS_EMPTY(&ifp->if_snd) == 0)
+ if (ifq_empty(&ifp->if_snd) == 0)
udav_start(ifp);
splx(s);
@@ -1194,7 +1194,7 @@ udav_watchdog(struct ifnet *ifp)
usbd_get_xfer_status(c->udav_xfer, NULL, NULL, NULL, &stat);
udav_txeof(c->udav_xfer, c, stat);
- if (IFQ_IS_EMPTY(&ifp->if_snd) == 0)
+ if (ifq_empty(&ifp->if_snd) == 0)
udav_start(ifp);
splx(s);
}
@@ -1394,7 +1394,7 @@ udav_tick_task(void *xsc)
DPRINTF(("%s: %s: got link\n",
sc->sc_dev.dv_xname, __func__));
sc->sc_link++;
- if (IFQ_IS_EMPTY(&ifp->if_snd) == 0)
+ if (ifq_empty(&ifp->if_snd) == 0)
udav_start(ifp);
}
diff --git a/sys/dev/usb/if_ugl.c b/sys/dev/usb/if_ugl.c
index 6ad47cc3f52..06c6690e88e 100644
--- a/sys/dev/usb/if_ugl.c
+++ b/sys/dev/usb/if_ugl.c
@@ -528,7 +528,7 @@ ugl_txeof(struct usbd_xfer *xfer, void *priv, usbd_status
status)
m_freem(c->ugl_mbuf);
c->ugl_mbuf = NULL;
- if (IFQ_IS_EMPTY(&ifp->if_snd) == 0)
+ if (ifq_empty(&ifp->if_snd) == 0)
ugl_start(ifp);
splx(s);
diff --git a/sys/dev/usb/if_umb.c b/sys/dev/usb/if_umb.c
index 09d4f37cb4e..9ddb5a8af8f 100644
--- a/sys/dev/usb/if_umb.c
+++ b/sys/dev/usb/if_umb.c
@@ -2143,7 +2143,7 @@ umb_txeof(struct usbd_xfer *xfer, void *priv, usbd_status
status)
usbd_clear_endpoint_stall_async(sc->sc_tx_pipe);
}
}
- if (IFQ_IS_EMPTY(&ifp->if_snd) == 0)
+ if (ifq_empty(&ifp->if_snd) == 0)
umb_start(ifp);
splx(s);
diff --git a/sys/dev/usb/if_upl.c b/sys/dev/usb/if_upl.c
index 55041eea950..5f13b858577 100644
--- a/sys/dev/usb/if_upl.c
+++ b/sys/dev/usb/if_upl.c
@@ -510,7 +510,7 @@ upl_txeof(struct usbd_xfer *xfer, void *priv, usbd_status
status)
m_freem(c->upl_mbuf);
c->upl_mbuf = NULL;
- if (IFQ_IS_EMPTY(&ifp->if_snd) == 0)
+ if (ifq_empty(&ifp->if_snd) == 0)
upl_start(ifp);
splx(s);
@@ -795,7 +795,7 @@ upl_watchdog(struct ifnet *ifp)
upl_stop(sc);
upl_init(sc);
- if (IFQ_IS_EMPTY(&ifp->if_snd) == 0)
+ if (ifq_empty(&ifp->if_snd) == 0)
upl_start(ifp);
}
diff --git a/sys/dev/usb/if_ure.c b/sys/dev/usb/if_ure.c
index 6fe92c2bf43..c2b38fa76f1 100644
--- a/sys/dev/usb/if_ure.c
+++ b/sys/dev/usb/if_ure.c
@@ -1824,7 +1824,7 @@ ure_txeof(struct usbd_xfer *xfer, void *priv, usbd_status
status)
m_freem(c->uc_mbuf);
c->uc_mbuf = NULL;
- if (!IFQ_IS_EMPTY(&ifp->if_snd))
+ if (!ifq_empty(&ifp->if_snd))
ure_start(ifp);
splx(s);
diff --git a/sys/dev/usb/if_url.c b/sys/dev/usb/if_url.c
index 26e7d618148..1b71477050a 100644
--- a/sys/dev/usb/if_url.c
+++ b/sys/dev/usb/if_url.c
@@ -887,7 +887,7 @@ url_txeof(struct usbd_xfer *xfer, void *priv, usbd_status
status)
m_freem(c->url_mbuf);
c->url_mbuf = NULL;
- if (IFQ_IS_EMPTY(&ifp->if_snd) == 0)
+ if (ifq_empty(&ifp->if_snd) == 0)
url_start(ifp);
splx(s);
@@ -1054,7 +1054,7 @@ url_watchdog(struct ifnet *ifp)
usbd_get_xfer_status(c->url_xfer, NULL, NULL, NULL, &stat);
url_txeof(c->url_xfer, c, stat);
- if (IFQ_IS_EMPTY(&ifp->if_snd) == 0)
+ if (ifq_empty(&ifp->if_snd) == 0)
url_start(ifp);
splx(s);
}
@@ -1238,7 +1238,7 @@ url_tick_task(void *xsc)
DPRINTF(("%s: %s: got link\n",
sc->sc_dev.dv_xname, __func__));
sc->sc_link++;
- if (IFQ_IS_EMPTY(&ifp->if_snd) == 0)
+ if (ifq_empty(&ifp->if_snd) == 0)
url_start(ifp);
}
diff --git a/sys/dev/usb/if_urndis.c b/sys/dev/usb/if_urndis.c
index debbbdb64b7..4382d7925c1 100644
--- a/sys/dev/usb/if_urndis.c
+++ b/sys/dev/usb/if_urndis.c
@@ -1312,7 +1312,7 @@ urndis_txeof(struct usbd_xfer *xfer,
if (err)
ifp->if_oerrors++;
- if (IFQ_IS_EMPTY(&ifp->if_snd) == 0)
+ if (ifq_empty(&ifp->if_snd) == 0)
urndis_start(ifp);
splx(s);
diff --git a/sys/dev/usb/if_wi_usb.c b/sys/dev/usb/if_wi_usb.c
index b0f1b65756c..03ee5361244 100644
--- a/sys/dev/usb/if_wi_usb.c
+++ b/sys/dev/usb/if_wi_usb.c
@@ -1138,7 +1138,7 @@ wi_usb_txeof_frm(struct usbd_xfer *xfer, void *priv,
wi_usb_tx_unlock(sc);
- if (!IFQ_IS_EMPTY(&ifp->if_snd))
+ if (!ifq_empty(&ifp->if_snd))
wi_start_usb(ifp);
splx(s);
diff --git a/sys/net/if_aggr.c b/sys/net/if_aggr.c
index 5b45c3dcfe7..834b8a05d28 100644
--- a/sys/net/if_aggr.c
+++ b/sys/net/if_aggr.c
@@ -560,7 +560,7 @@ aggr_clone_create(struct if_clone *ifc, int unit)
ifp->if_flags = IFF_BROADCAST | IFF_MULTICAST | IFF_SIMPLEX;
ifp->if_xflags = IFXF_CLONED | IFXF_MPSAFE;
ifp->if_link_state = LINK_STATE_DOWN;
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
+ ifq_set_maxlen(&ifp->if_snd, IFQ_MAXLEN);
ether_fakeaddr(ifp);
if_counters_alloc(ifp);
diff --git a/sys/net/if_bpe.c b/sys/net/if_bpe.c
index 13224499bb1..d260e029218 100644
--- a/sys/net/if_bpe.c
+++ b/sys/net/if_bpe.c
@@ -190,7 +190,7 @@ bpe_clone_create(struct if_clone *ifc, int unit)
ifp->if_start = bpe_start;
ifp->if_flags = IFF_BROADCAST | IFF_MULTICAST;
ifp->if_xflags = IFXF_CLONED;
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
+ ifq_set_maxlen(&ifp->if_snd, IFQ_MAXLEN);
ether_fakeaddr(ifp);
if_counters_alloc(ifp);
diff --git a/sys/net/if_etherip.c b/sys/net/if_etherip.c
index e43f8c223b9..7461b7efe6a 100644
--- a/sys/net/if_etherip.c
+++ b/sys/net/if_etherip.c
@@ -150,7 +150,7 @@ etherip_clone_create(struct if_clone *ifc, int unit)
ifp->if_start = etherip_start;
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
ifp->if_xflags = IFXF_CLONED;
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
+ ifq_set_maxlen(&ifp->if_snd, IFQ_MAXLEN);
ifp->if_capabilities = IFCAP_VLAN_MTU;
ether_fakeaddr(ifp);
diff --git a/sys/net/if_gif.c b/sys/net/if_gif.c
index 333b1ccb469..6a6a103208e 100644
--- a/sys/net/if_gif.c
+++ b/sys/net/if_gif.c
@@ -170,7 +170,7 @@ gif_clone_create(struct if_clone *ifc, int unit)
ifp->if_output = gif_output;
ifp->if_rtrequest = p2p_rtrequest;
ifp->if_type = IFT_GIF;
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
+ ifq_set_maxlen(&ifp->if_snd, IFQ_MAXLEN);
ifp->if_softc = sc;
if_attach(ifp);
diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c
index 0b3c3525d8e..c79ce6d6ee0 100644
--- a/sys/net/if_gre.c
+++ b/sys/net/if_gre.c
@@ -715,7 +715,7 @@ egre_clone_create(struct if_clone *ifc, int unit)
ifp->if_ioctl = egre_ioctl;
ifp->if_start = egre_start;
ifp->if_xflags = IFXF_CLONED;
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
+ ifq_set_maxlen(&ifp->if_snd, IFQ_MAXLEN);
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
ether_fakeaddr(ifp);
@@ -777,7 +777,7 @@ nvgre_clone_create(struct if_clone *ifc, int unit)
ifp->if_ioctl = nvgre_ioctl;
ifp->if_start = nvgre_start;
ifp->if_xflags = IFXF_CLONED;
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
+ ifq_set_maxlen(&ifp->if_snd, IFQ_MAXLEN);
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
ether_fakeaddr(ifp);
@@ -849,7 +849,7 @@ eoip_clone_create(struct if_clone *ifc, int unit)
ifp->if_ioctl = eoip_ioctl;
ifp->if_start = eoip_start;
ifp->if_xflags = IFXF_CLONED;
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
+ ifq_set_maxlen(&ifp->if_snd, IFQ_MAXLEN);
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
ether_fakeaddr(ifp);
diff --git a/sys/net/if_mpe.c b/sys/net/if_mpe.c
index 33f9cf48c74..dbc5f377289 100644
--- a/sys/net/if_mpe.c
+++ b/sys/net/if_mpe.c
@@ -112,7 +112,7 @@ mpe_clone_create(struct if_clone *ifc, int unit)
ifp->if_start = mpe_start;
ifp->if_type = IFT_MPLS;
ifp->if_hdrlen = MPE_HDRLEN;
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
+ ifq_set_maxlen(&ifp->if_snd, IFQ_MAXLEN);
sc->sc_dead = 0;
diff --git a/sys/net/if_mpip.c b/sys/net/if_mpip.c
index 36c9f090270..01b95f65ec3 100644
--- a/sys/net/if_mpip.c
+++ b/sys/net/if_mpip.c
@@ -117,7 +117,7 @@ mpip_clone_create(struct if_clone *ifc, int unit)
ifp->if_rtrequest = p2p_rtrequest;
ifp->if_mtu = 1500;
ifp->if_hardmtu = 65535;
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
+ ifq_set_maxlen(&ifp->if_snd, IFQ_MAXLEN);
if_attach(ifp);
if_counters_alloc(ifp);
diff --git a/sys/net/if_mpw.c b/sys/net/if_mpw.c
index eb9c1c0888b..eac433aa5db 100644
--- a/sys/net/if_mpw.c
+++ b/sys/net/if_mpw.c
@@ -111,7 +111,7 @@ mpw_clone_create(struct if_clone *ifc, int unit)
ifp->if_output = mpw_output;
ifp->if_start = mpw_start;
ifp->if_hardmtu = ETHER_MAX_HARDMTU_LEN;
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
+ ifq_set_maxlen(&ifp->if_snd, IFQ_MAXLEN);
ether_fakeaddr(ifp);
sc->sc_dead = 0;
diff --git a/sys/net/if_pair.c b/sys/net/if_pair.c
index e8446ed721b..b4c940170b7 100644
--- a/sys/net/if_pair.c
+++ b/sys/net/if_pair.c
@@ -118,7 +118,7 @@ pair_clone_create(struct if_clone *ifc, int unit)
ifp->if_ioctl = pairioctl;
ifp->if_start = pairstart;
ifp->if_xflags = IFXF_CLONED;
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
+ ifq_set_maxlen(&ifp->if_snd, IFQ_MAXLEN);
ifp->if_hardmtu = ETHER_MAX_HARDMTU_LEN;
ifp->if_capabilities = IFCAP_VLAN_MTU;
diff --git a/sys/net/if_pflog.c b/sys/net/if_pflog.c
index 04bcb97ad83..8e0bbf3b669 100644
--- a/sys/net/if_pflog.c
+++ b/sys/net/if_pflog.c
@@ -147,7 +147,7 @@ pflog_clone_create(struct if_clone *ifc, int unit)
ifp->if_start = pflogstart;
ifp->if_xflags = IFXF_CLONED;
ifp->if_type = IFT_PFLOG;
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
+ ifq_set_maxlen(&ifp->if_snd, IFQ_MAXLEN);
ifp->if_hdrlen = PFLOG_HDRLEN;
if_attach(ifp);
if_alloc_sadl(ifp);
diff --git a/sys/net/if_pflow.c b/sys/net/if_pflow.c
index 1d482865013..3cc3e3d623d 100644
--- a/sys/net/if_pflow.c
+++ b/sys/net/if_pflow.c
@@ -248,7 +248,7 @@ pflow_clone_create(struct if_clone *ifc, int unit)
ifp->if_start = NULL;
ifp->if_xflags = IFXF_CLONED;
ifp->if_type = IFT_PFLOW;
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
+ ifq_set_maxlen(&ifp->if_snd, IFQ_MAXLEN);
ifp->if_hdrlen = PFLOW_HDRLEN;
ifp->if_flags = IFF_UP;
ifp->if_flags &= ~IFF_RUNNING; /* not running, need receiver */
diff --git a/sys/net/if_pfsync.c b/sys/net/if_pfsync.c
index 7fcd2ba63a7..5e5185fb571 100644
--- a/sys/net/if_pfsync.c
+++ b/sys/net/if_pfsync.c
@@ -341,7 +341,7 @@ pfsync_clone_create(struct if_clone *ifc, int unit)
ifp->if_output = pfsyncoutput;
ifp->if_start = pfsyncstart;
ifp->if_type = IFT_PFSYNC;
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
+ ifq_set_maxlen(&ifp->if_snd, IFQ_MAXLEN);
ifp->if_hdrlen = sizeof(struct pfsync_header);
ifp->if_mtu = ETHERMTU;
ifp->if_xflags = IFXF_CLONED;
diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c
index 838e47f1e6b..55e11dfc4d0 100644
--- a/sys/net/if_ppp.c
+++ b/sys/net/if_ppp.c
@@ -220,7 +220,7 @@ ppp_clone_create(struct if_clone *ifc, int unit)
sc->sc_if.if_output = pppoutput;
sc->sc_if.if_start = ppp_ifstart;
sc->sc_if.if_rtrequest = p2p_rtrequest;
- IFQ_SET_MAXLEN(&sc->sc_if.if_snd, IFQ_MAXLEN);
+ ifq_set_maxlen(&sc->sc_if.if_snd, IFQ_MAXLEN);
mq_init(&sc->sc_inq, IFQ_MAXLEN, IPL_NET);
ppp_pkt_list_init(&sc->sc_rawq, IFQ_MAXLEN);
if_attach(&sc->sc_if);
@@ -992,7 +992,7 @@ pppintr(void)
LIST_FOREACH(sc, &ppp_softc_list, sc_list) {
if (!(sc->sc_flags & SC_TBUSY) &&
- (!IFQ_IS_EMPTY(&sc->sc_if.if_snd))) {
+ (!ifq_empty(&sc->sc_if.if_snd))) {
s = splnet();
sc->sc_flags |= SC_TBUSY;
splx(s);
diff --git a/sys/net/if_pppoe.c b/sys/net/if_pppoe.c
index 21fe335104d..9743e842c83 100644
--- a/sys/net/if_pppoe.c
+++ b/sys/net/if_pppoe.c
@@ -212,7 +212,7 @@ pppoe_clone_create(struct if_clone *ifc, int unit)
sc->sc_sppp.pp_if.if_rtrequest = p2p_rtrequest;
sc->sc_sppp.pp_tls = pppoe_tls;
sc->sc_sppp.pp_tlf = pppoe_tlf;
- IFQ_SET_MAXLEN(&sc->sc_sppp.pp_if.if_snd, IFQ_MAXLEN);
+ ifq_set_maxlen(&sc->sc_sppp.pp_if.if_snd, IFQ_MAXLEN);
/* changed to real address later */
memcpy(&sc->sc_dest, etherbroadcastaddr, sizeof(sc->sc_dest));
diff --git a/sys/net/if_pppx.c b/sys/net/if_pppx.c
index 2ee5be0938d..cde32e9fc3a 100644
--- a/sys/net/if_pppx.c
+++ b/sys/net/if_pppx.c
@@ -710,7 +710,7 @@ pppx_add_session(struct pppx_dev *pxd, struct
pipex_session_req *req)
ifp->if_ioctl = pppx_if_ioctl;
ifp->if_rtrequest = p2p_rtrequest;
ifp->if_type = IFT_PPP;
- IFQ_SET_MAXLEN(&ifp->if_snd, 1);
+ ifq_set_maxlen(&ifp->if_snd, 1);
ifp->if_softc = pxi;
/* ifp->if_rdomain = req->pr_rdomain; */
@@ -1118,7 +1118,7 @@ pppacopen(dev_t dev, int flags, int mode, struct proc *p)
ifp->if_start = pppac_start;
ifp->if_ioctl = pppac_ioctl;
/* XXXSMP: be sure pppac_start() called under NET_LOCK() */
- IFQ_SET_MAXLEN(&ifp->if_snd, 1);
+ ifq_set_maxlen(&ifp->if_snd, 1);
if_counters_alloc(ifp);
if_attach(ifp);
diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c
index 0da09a3b6ec..2d073fc284e 100644
--- a/sys/net/if_spppsubr.c
+++ b/sys/net/if_spppsubr.c
@@ -702,7 +702,7 @@ sppp_attach(struct ifnet *ifp)
sp->pp_if.if_type = IFT_PPP;
sp->pp_if.if_output = sppp_output;
- IFQ_SET_MAXLEN(&sp->pp_if.if_snd, 50);
+ ifq_set_maxlen(&sp->pp_if.if_snd, 50);
mq_init(&sp->pp_cpq, 50, IPL_NET);
sp->pp_loopcnt = 0;
sp->pp_alivecnt = 0;
@@ -782,7 +782,7 @@ sppp_isempty(struct ifnet *ifp)
int empty, s;
s = splnet();
- empty = mq_empty(&sp->pp_cpq) && IFQ_IS_EMPTY(&sp->pp_if.if_snd);
+ empty = mq_empty(&sp->pp_cpq) && ifq_empty(&sp->pp_if.if_snd);
splx(s);
return (empty);
}
diff --git a/sys/net/if_tpmr.c b/sys/net/if_tpmr.c
index 6a1c7dfc72d..dc3f676562b 100644
--- a/sys/net/if_tpmr.c
+++ b/sys/net/if_tpmr.c
@@ -171,7 +171,7 @@ tpmr_clone_create(struct if_clone *ifc, int unit)
ifp->if_flags = IFF_POINTOPOINT;
ifp->if_xflags = IFXF_CLONED | IFXF_MPSAFE;
ifp->if_link_state = LINK_STATE_DOWN;
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
+ ifq_set_maxlen(&ifp->if_snd, IFQ_MAXLEN);
if_counters_alloc(ifp);
if_attach(ifp);
diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index fcf275a1ea5..d6537ae7bbd 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -235,7 +235,7 @@ tun_create(struct if_clone *ifc, int unit, int flags)
ifp->if_start = tun_start;
ifp->if_hardmtu = TUNMRU;
ifp->if_link_state = LINK_STATE_DOWN;
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
+ ifq_set_maxlen(&ifp->if_snd, IFQ_MAXLEN);
if_counters_alloc(ifp);
diff --git a/sys/net/if_var.h b/sys/net/if_var.h
index 2f367b93b30..4f528210ea5 100644
--- a/sys/net/if_var.h
+++ b/sys/net/if_var.h
@@ -281,13 +281,6 @@ struct ifg_list {
#define IFNET_SLOWTIMO 1 /* granularity is 1 second */
-/*
- * IFQ compat on ifq API
- */
-
-#define IFQ_IS_EMPTY(ifq) ifq_empty(ifq)
-#define IFQ_SET_MAXLEN(ifq, len) ifq_set_maxlen(ifq, len)
-
#define IF_TXMIT_MIN 1
#define IF_TXMIT_DEFAULT 16
diff --git a/sys/net/if_vether.c b/sys/net/if_vether.c
index 0dc12d95432..0d524be1dca 100644
--- a/sys/net/if_vether.c
+++ b/sys/net/if_vether.c
@@ -84,7 +84,7 @@ vether_clone_create(struct if_clone *ifc, int unit)
ifp->if_softc = sc;
ifp->if_ioctl = vetherioctl;
ifp->if_start = vetherstart;
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
+ ifq_set_maxlen(&ifp->if_snd, IFQ_MAXLEN);
ifp->if_hardmtu = ETHER_MAX_HARDMTU_LEN;
ifp->if_capabilities = IFCAP_VLAN_MTU;
diff --git a/sys/net/if_vxlan.c b/sys/net/if_vxlan.c
index 56b95e78060..4eed01da039 100644
--- a/sys/net/if_vxlan.c
+++ b/sys/net/if_vxlan.c
@@ -151,7 +151,7 @@ vxlan_clone_create(struct if_clone *ifc, int unit)
ifp->if_softc = sc;
ifp->if_ioctl = vxlanioctl;
ifp->if_start = vxlanstart;
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
+ ifq_set_maxlen(&ifp->if_snd, IFQ_MAXLEN);
ifp->if_hardmtu = ETHER_MAX_HARDMTU_LEN;
ifp->if_capabilities = IFCAP_VLAN_MTU;
diff --git a/sys/net/if_wg.c b/sys/net/if_wg.c
index a1b4d409deb..d8f860ce48b 100644
--- a/sys/net/if_wg.c
+++ b/sys/net/if_wg.c
@@ -2652,7 +2652,7 @@ wg_clone_create(struct if_clone *ifc, int unit)
ifp->if_output = wg_output;
ifp->if_type = IFT_WIREGUARD;
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
+ ifq_set_maxlen(&ifp->if_snd, IFQ_MAXLEN);
if_attach(ifp);
if_alloc_sadl(ifp);
