aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMaxim Sobolev <sobomax@FreeBSD.org>2010-11-16 04:40:03 +0000
committerMaxim Sobolev <sobomax@FreeBSD.org>2010-11-16 04:40:03 +0000
commit33277cd93ac5d310691576dc71a2aff357cebdb1 (patch)
treea9ba1ce234aaf855b59c82b1830077145509e519 /sys
parent380e09851043ef2a186f7212ecf957262e6a2dff (diff)
Notes
Diffstat (limited to 'sys')
-rw-r--r--sys/arm/at91/if_ate.c4
-rw-r--r--sys/arm/xscale/ixp425/if_npe.c2
-rw-r--r--sys/contrib/dev/oltr/if_oltr.c2
-rw-r--r--sys/dev/ae/if_ae.c2
-rw-r--r--sys/dev/an/if_an.c4
-rw-r--r--sys/dev/ar/if_ar.c4
-rw-r--r--sys/dev/arl/if_arl.c2
-rw-r--r--sys/dev/ath/if_ath.c4
-rw-r--r--sys/dev/awi/awi.c2
-rw-r--r--sys/dev/ce/if_ce.c8
-rw-r--r--sys/dev/cm/smc90cx6.c2
-rw-r--r--sys/dev/cnw/if_cnw.c2
-rw-r--r--sys/dev/cp/if_cp.c4
-rw-r--r--sys/dev/cs/if_cs.c2
-rw-r--r--sys/dev/ctau/if_ct.c4
-rw-r--r--sys/dev/cx/if_cx.c4
-rw-r--r--sys/dev/cxgb/cxgb_main.c2
-rw-r--r--sys/dev/ed/if_ed.c4
-rw-r--r--sys/dev/ep/if_ep.c4
-rw-r--r--sys/dev/ex/if_ex.c2
-rw-r--r--sys/dev/ie/if_ie.c2
-rw-r--r--sys/dev/iicbus/if_ic.c2
-rw-r--r--sys/dev/ipw/if_ipw.c4
-rw-r--r--sys/dev/iwi/if_iwi.c4
-rw-r--r--sys/dev/le/lance.c4
-rw-r--r--sys/dev/malo/if_malo.c4
-rw-r--r--sys/dev/my/if_my.c4
-rw-r--r--sys/dev/nxge/if_nxge.c2
-rw-r--r--sys/dev/pdq/pdq_ifsubr.c2
-rw-r--r--sys/dev/ppbus/if_plip.c2
-rw-r--r--sys/dev/ral/rt2560.c4
-rw-r--r--sys/dev/ral/rt2661.c4
-rw-r--r--sys/dev/ray/if_ray.c2
-rw-r--r--sys/dev/sbni/if_sbni.c2
-rw-r--r--sys/dev/sbsh/if_sbsh.c2
-rw-r--r--sys/dev/sn/if_sn.c4
-rw-r--r--sys/dev/snc/dp83932.c2
-rw-r--r--sys/dev/sr/if_sr.c4
-rw-r--r--sys/dev/usb/if_aue.c4
-rw-r--r--sys/dev/usb/if_axe.c4
-rw-r--r--sys/dev/usb/if_cdce.c2
-rw-r--r--sys/dev/usb/if_cue.c2
-rw-r--r--sys/dev/usb/if_kue.c2
-rw-r--r--sys/dev/usb/if_rue.c2
-rw-r--r--sys/dev/usb/if_rum.c4
-rw-r--r--sys/dev/usb/if_udav.c2
-rw-r--r--sys/dev/usb/if_ural.c4
-rw-r--r--sys/dev/usb/if_zyd.c2
-rw-r--r--sys/dev/usb/udbp.c4
-rw-r--r--sys/dev/vx/if_vx.c2
-rw-r--r--sys/dev/wi/if_wi.c4
-rw-r--r--sys/dev/wl/if_wl.c2
-rw-r--r--sys/dev/wpi/if_wpi.c4
-rw-r--r--sys/dev/xe/if_xe.c2
-rw-r--r--sys/i4b/capi/capi_l4if.c8
-rw-r--r--sys/i4b/driver/i4b_ing.c4
-rw-r--r--sys/i4b/driver/i4b_isppp.c2
-rw-r--r--sys/i4b/driver/i4b_trace.c2
-rw-r--r--sys/i4b/layer1/ifpi/i4b_ifpi_pci.c4
-rw-r--r--sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c4
-rw-r--r--sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c4
-rw-r--r--sys/i4b/layer1/ihfc/i4b_ihfc_drv.c4
-rw-r--r--sys/i4b/layer1/isic/i4b_bchan.c4
-rw-r--r--sys/i4b/layer1/itjc/i4b_itjc_pci.c4
-rw-r--r--sys/i4b/layer1/iwic/i4b_iwic_bchan.c4
-rw-r--r--sys/i4b/layer4/i4b_i4bdrv.c2
-rw-r--r--sys/net/if.c4
-rw-r--r--sys/net/if_ef.c2
-rw-r--r--sys/net/if_gif.c2
-rw-r--r--sys/net/if_gre.c2
-rw-r--r--sys/net/if_ppp.c8
-rw-r--r--sys/net/if_stf.c2
-rw-r--r--sys/netatalk/ddp_usrreq.c6
-rw-r--r--sys/netgraph/ng_eiface.c2
-rw-r--r--sys/netgraph/ng_fec.c2
-rw-r--r--sys/netgraph/ng_iface.c4
-rw-r--r--sys/netgraph/ng_tty.c2
-rw-r--r--sys/netinet/ip_input.c3
-rw-r--r--sys/netinet6/ip6_input.c3
-rw-r--r--sys/netipx/ipx_input.c2
-rw-r--r--sys/pci/if_rl.c4
81 files changed, 130 insertions, 128 deletions
diff --git a/sys/arm/at91/if_ate.c b/sys/arm/at91/if_ate.c
index 4d7659cbc85f..5dae1a56378c 100644
--- a/sys/arm/at91/if_ate.c
+++ b/sys/arm/at91/if_ate.c
@@ -231,8 +231,8 @@ ate_attach(device_t dev)
ifp->if_ioctl = ateioctl;
ifp->if_init = ateinit;
ifp->if_baudrate = 10000000;
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
- ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN;
+ IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen);
+ ifp->if_snd.ifq_drv_maxlen = ifqmaxlen;
IFQ_SET_READY(&ifp->if_snd);
ifp->if_timer = 0;
ifp->if_linkmib = &sc->mibdata;
diff --git a/sys/arm/xscale/ixp425/if_npe.c b/sys/arm/xscale/ixp425/if_npe.c
index f59cf59f6230..9231647e06db 100644
--- a/sys/arm/xscale/ixp425/if_npe.c
+++ b/sys/arm/xscale/ixp425/if_npe.c
@@ -335,7 +335,7 @@ npe_attach(device_t dev)
ifp->if_ioctl = npeioctl;
ifp->if_init = npeinit;
IFQ_SET_MAXLEN(&ifp->if_snd, sc->txdma.nbuf - 1);
- ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN;
+ ifp->if_snd.ifq_drv_maxlen = ifqmaxlen;
IFQ_SET_READY(&ifp->if_snd);
ifp->if_linkmib = &sc->mibdata;
ifp->if_linkmiblen = sizeof(sc->mibdata);
diff --git a/sys/contrib/dev/oltr/if_oltr.c b/sys/contrib/dev/oltr/if_oltr.c
index 1f62d41f02a0..7e32ce00d7b7 100644
--- a/sys/contrib/dev/oltr/if_oltr.c
+++ b/sys/contrib/dev/oltr/if_oltr.c
@@ -171,7 +171,7 @@ oltr_attach(device_t dev)
ifp->if_start = oltr_start;
ifp->if_ioctl = oltr_ioctl;
ifp->if_flags = IFF_BROADCAST | IFF_NEEDSGIANT;
- ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
+ ifp->if_snd.ifq_maxlen = ifqmaxlen;
/*
* Do ifmedia setup.
diff --git a/sys/dev/ae/if_ae.c b/sys/dev/ae/if_ae.c
index a26e08e973ca..7e8f40408a9d 100644
--- a/sys/dev/ae/if_ae.c
+++ b/sys/dev/ae/if_ae.c
@@ -375,7 +375,7 @@ ae_attach(device_t dev)
ifp->if_init = ae_init;
ifp->if_capabilities = IFCAP_VLAN_MTU | IFCAP_VLAN_HWTAGGING;
ifp->if_hwassist = 0;
- ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN;
+ ifp->if_snd.ifq_drv_maxlen = ifqmaxlen;
IFQ_SET_MAXLEN(&ifp->if_snd, ifp->if_snd.ifq_drv_maxlen);
IFQ_SET_READY(&ifp->if_snd);
if (pci_find_extcap(dev, PCIY_PMG, &pmc) == 0) {
diff --git a/sys/dev/an/if_an.c b/sys/dev/an/if_an.c
index db88e0c9ed1d..078eb0a7c281 100644
--- a/sys/dev/an/if_an.c
+++ b/sys/dev/an/if_an.c
@@ -742,8 +742,8 @@ an_attach(struct an_softc *sc, int unit, int flags)
ifp->if_watchdog = an_watchdog;
ifp->if_init = an_init;
ifp->if_baudrate = 10000000;
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
- ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN;
+ IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen);
+ ifp->if_snd.ifq_drv_maxlen = ifqmaxlen;
IFQ_SET_READY(&ifp->if_snd);
bzero(sc->an_config.an_nodename, sizeof(sc->an_config.an_nodename));
diff --git a/sys/dev/ar/if_ar.c b/sys/dev/ar/if_ar.c
index 35756e4f6395..56933ef15213 100644
--- a/sys/dev/ar/if_ar.c
+++ b/sys/dev/ar/if_ar.c
@@ -333,8 +333,8 @@ ar_attach(device_t device)
}
NG_NODE_SET_PRIVATE(sc->node, sc);
callout_handle_init(&sc->handle);
- sc->xmitq.ifq_maxlen = IFQ_MAXLEN;
- sc->xmitq_hipri.ifq_maxlen = IFQ_MAXLEN;
+ sc->xmitq.ifq_maxlen = ifqmaxlen;
+ sc->xmitq_hipri.ifq_maxlen = ifqmaxlen;
mtx_init(&sc->xmitq.ifq_mtx, "ar_xmitq", NULL, MTX_DEF);
mtx_init(&sc->xmitq_hipri.ifq_mtx, "ar_xmitq_hipri", NULL,
MTX_DEF);
diff --git a/sys/dev/arl/if_arl.c b/sys/dev/arl/if_arl.c
index 8be9bdab67eb..0d1a18fbf6ba 100644
--- a/sys/dev/arl/if_arl.c
+++ b/sys/dev/arl/if_arl.c
@@ -227,7 +227,7 @@ arl_attach(dev)
ifp->if_ioctl = arl_ioctl;
ifp->if_watchdog = arl_watchdog;
ifp->if_init = arl_init;
- ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
+ ifp->if_snd.ifq_maxlen = ifqmaxlen;
ifp->if_baudrate = 2000000;
ifp->if_timer = 0;
diff --git a/sys/dev/ath/if_ath.c b/sys/dev/ath/if_ath.c
index 35384ab5e88b..263fd787ffea 100644
--- a/sys/dev/ath/if_ath.c
+++ b/sys/dev/ath/if_ath.c
@@ -495,8 +495,8 @@ ath_attach(u_int16_t devid, struct ath_softc *sc)
ifp->if_watchdog = ath_watchdog;
ifp->if_ioctl = ath_ioctl;
ifp->if_init = ath_init;
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
- ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN;
+ IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen);
+ ifp->if_snd.ifq_drv_maxlen = ifqmaxlen;
IFQ_SET_READY(&ifp->if_snd);
ic->ic_ifp = ifp;
diff --git a/sys/dev/awi/awi.c b/sys/dev/awi/awi.c
index 954a83175db2..2b2cc9183517 100644
--- a/sys/dev/awi/awi.c
+++ b/sys/dev/awi/awi.c
@@ -295,7 +295,7 @@ awi_attach(struct awi_softc *sc)
#endif
#ifdef __FreeBSD__
ifp->if_init = awi_init0;
- ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
+ ifp->if_snd.ifq_maxlen = ifqmaxlen;
if_initname(ifp, device_get_name(sc->sc_dev),
device_get_unit(sc->sc_dev));
#endif
diff --git a/sys/dev/ce/if_ce.c b/sys/dev/ce/if_ce.c
index 396d670355e1..2cbb42e3adda 100644
--- a/sys/dev/ce/if_ce.c
+++ b/sys/dev/ce/if_ce.c
@@ -727,9 +727,9 @@ static int ce_attach (device_t dev)
#endif
continue;
}
- d->queue.ifq_maxlen = IFQ_MAXLEN;
- d->hi_queue.ifq_maxlen = IFQ_MAXLEN;
- d->rqueue.ifq_maxlen = IFQ_MAXLEN;
+ d->queue.ifq_maxlen = ifqmaxlen;
+ d->hi_queue.ifq_maxlen = ifqmaxlen;
+ d->rqueue.ifq_maxlen = ifqmaxlen;
#if __FreeBSD_version >= 500000
mtx_init (&d->queue.ifq_mtx, "ce_queue", NULL, MTX_DEF);
mtx_init (&d->hi_queue.ifq_mtx, "ce_queue_hi", NULL, MTX_DEF);
@@ -763,7 +763,7 @@ static int ce_attach (device_t dev)
d->ifp->if_start = ce_ifstart;
d->ifp->if_watchdog = ce_ifwatchdog;
d->ifp->if_init = ce_initialize;
- d->rqueue.ifq_maxlen = IFQ_MAXLEN;
+ d->rqueue.ifq_maxlen = ifqmaxlen;
#if __FreeBSD_version >= 500000
mtx_init (&d->rqueue.ifq_mtx, "ce_rqueue", NULL, MTX_DEF);
#endif
diff --git a/sys/dev/cm/smc90cx6.c b/sys/dev/cm/smc90cx6.c
index 1dda17ff6b3f..d7dedbf794e1 100644
--- a/sys/dev/cm/smc90cx6.c
+++ b/sys/dev/cm/smc90cx6.c
@@ -197,7 +197,7 @@ cm_attach(dev)
ifp->if_watchdog = cm_watchdog;
ifp->if_init = cm_init;
/* XXX IFQ_SET_READY(&ifp->if_snd); */
- ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
+ ifp->if_snd.ifq_maxlen = ifqmaxlen;
ifp->if_timer = 0;
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX;
diff --git a/sys/dev/cnw/if_cnw.c b/sys/dev/cnw/if_cnw.c
index f4455bd5aa1d..ca247fbb020a 100644
--- a/sys/dev/cnw/if_cnw.c
+++ b/sys/dev/cnw/if_cnw.c
@@ -1666,7 +1666,7 @@ static int cnw_pccard_attach(device_t dev)
ifp->if_watchdog = cnw_watchdog;
ifp->if_init = cnw_freebsd_init;
ifp->if_baudrate = 1 * 1000* 1000;
- ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
+ ifp->if_snd.ifq_maxlen = ifqmaxlen;
cnw_freebsd_init(sc);
cnw_stop(sc);
diff --git a/sys/dev/cp/if_cp.c b/sys/dev/cp/if_cp.c
index 36b12abbf704..8c29697cd4bf 100644
--- a/sys/dev/cp/if_cp.c
+++ b/sys/dev/cp/if_cp.c
@@ -521,8 +521,8 @@ static int cp_attach (device_t dev)
NG_NODE_UNREF (d->node);
continue;
}
- d->queue.ifq_maxlen = IFQ_MAXLEN;
- d->hi_queue.ifq_maxlen = IFQ_MAXLEN;
+ d->queue.ifq_maxlen = ifqmaxlen;
+ d->hi_queue.ifq_maxlen = ifqmaxlen;
mtx_init (&d->queue.ifq_mtx, "cp_queue", NULL, MTX_DEF);
mtx_init (&d->hi_queue.ifq_mtx, "cp_queue_hi", NULL, MTX_DEF);
callout_init (&d->timeout_handle,
diff --git a/sys/dev/cs/if_cs.c b/sys/dev/cs/if_cs.c
index 7c6ac932ba85..d6314d19faa0 100644
--- a/sys/dev/cs/if_cs.c
+++ b/sys/dev/cs/if_cs.c
@@ -602,7 +602,7 @@ cs_attach(device_t dev)
ifp->if_ioctl=cs_ioctl;
ifp->if_watchdog=cs_watchdog;
ifp->if_init=cs_init;
- ifp->if_snd.ifq_maxlen= IFQ_MAXLEN;
+ ifp->if_snd.ifq_maxlen= ifqmaxlen;
/*
* MIB DATA
*/
diff --git a/sys/dev/ctau/if_ct.c b/sys/dev/ctau/if_ct.c
index f2d876d399ef..7240e9724573 100644
--- a/sys/dev/ctau/if_ct.c
+++ b/sys/dev/ctau/if_ct.c
@@ -737,8 +737,8 @@ static int ct_attach (device_t dev)
ct_bus_dma_mem_free (&d->dmamem);
continue;
}
- d->queue.ifq_maxlen = IFQ_MAXLEN;
- d->hi_queue.ifq_maxlen = IFQ_MAXLEN;
+ d->queue.ifq_maxlen = ifqmaxlen;
+ d->hi_queue.ifq_maxlen = ifqmaxlen;
mtx_init (&d->queue.ifq_mtx, "ct_queue", NULL, MTX_DEF);
mtx_init (&d->hi_queue.ifq_mtx, "ct_queue_hi", NULL, MTX_DEF);
callout_init (&d->timeout_handle,
diff --git a/sys/dev/cx/if_cx.c b/sys/dev/cx/if_cx.c
index be164bd425cd..970c6b16c7a7 100644
--- a/sys/dev/cx/if_cx.c
+++ b/sys/dev/cx/if_cx.c
@@ -845,8 +845,8 @@ static int cx_attach (device_t dev)
cx_bus_dma_mem_free (&d->dmamem);
continue;
}
- d->lo_queue.ifq_maxlen = IFQ_MAXLEN;
- d->hi_queue.ifq_maxlen = IFQ_MAXLEN;
+ d->lo_queue.ifq_maxlen = ifqmaxlen;
+ d->hi_queue.ifq_maxlen = ifqmaxlen;
mtx_init (&d->lo_queue.ifq_mtx, "cx_queue_lo", NULL, MTX_DEF);
mtx_init (&d->hi_queue.ifq_mtx, "cx_queue_hi", NULL, MTX_DEF);
callout_init (&d->timeout_handle,
diff --git a/sys/dev/cxgb/cxgb_main.c b/sys/dev/cxgb/cxgb_main.c
index f0cebf7f6cde..b3c8850b679a 100644
--- a/sys/dev/cxgb/cxgb_main.c
+++ b/sys/dev/cxgb/cxgb_main.c
@@ -1075,7 +1075,7 @@ cxgb_port_attach(device_t dev)
ifp->if_timer = 0; /* Disable ifnet watchdog */
ifp->if_watchdog = NULL;
- ifp->if_snd.ifq_drv_maxlen = cxgb_snd_queue_len;
+ ifp->if_snd.ifq_drv_maxlen = max(cxgb_snd_queue_len, ifqmaxlen);
IFQ_SET_MAXLEN(&ifp->if_snd, ifp->if_snd.ifq_drv_maxlen);
IFQ_SET_READY(&ifp->if_snd);
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index 8a9d80746857..49a56e05fe5f 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -289,8 +289,8 @@ ed_attach(device_t dev)
ifp->if_ioctl = ed_ioctl;
ifp->if_watchdog = ed_watchdog;
ifp->if_init = ed_init;
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
- ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN;
+ IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen);
+ ifp->if_snd.ifq_drv_maxlen = ifqmaxlen;
IFQ_SET_READY(&ifp->if_snd);
ifp->if_linkmib = &sc->mibdata;
ifp->if_linkmiblen = sizeof sc->mibdata;
diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c
index 3b913693a3dc..974b957b8457 100644
--- a/sys/dev/ep/if_ep.c
+++ b/sys/dev/ep/if_ep.c
@@ -304,8 +304,8 @@ ep_attach(struct ep_softc *sc)
ifp->if_ioctl = epioctl;
ifp->if_watchdog = epwatchdog;
ifp->if_init = epinit;
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
- ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN;
+ IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen);
+ ifp->if_snd.ifq_drv_maxlen = ifqmaxlen;
IFQ_SET_READY(&ifp->if_snd);
if (!sc->epb.mii_trans) {
diff --git a/sys/dev/ex/if_ex.c b/sys/dev/ex/if_ex.c
index cd5b975ddb28..d78a397891fd 100644
--- a/sys/dev/ex/if_ex.c
+++ b/sys/dev/ex/if_ex.c
@@ -238,7 +238,7 @@ ex_attach(device_t dev)
ifp->if_ioctl = ex_ioctl;
ifp->if_watchdog = ex_watchdog;
ifp->if_init = ex_init;
- ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
+ ifp->if_snd.ifq_maxlen = ifqmaxlen;
ifmedia_init(&sc->ifmedia, 0, ex_ifmedia_upd, ex_ifmedia_sts);
diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c
index bc57da374f10..614973182773 100644
--- a/sys/dev/ie/if_ie.c
+++ b/sys/dev/ie/if_ie.c
@@ -319,7 +319,7 @@ ie_attach(device_t dev)
ifp->if_start = iestart;
ifp->if_ioctl = ieioctl;
ifp->if_init = ieinit;
- ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
+ ifp->if_snd.ifq_maxlen = ifqmaxlen;
if (sc->hard_type == IE_EE16)
EVENTHANDLER_REGISTER(shutdown_post_sync, ee16_shutdown,
diff --git a/sys/dev/iicbus/if_ic.c b/sys/dev/iicbus/if_ic.c
index beca6019f0a8..7597ac5ff7f2 100644
--- a/sys/dev/iicbus/if_ic.c
+++ b/sys/dev/iicbus/if_ic.c
@@ -146,7 +146,7 @@ icattach(device_t dev)
ifp->if_output = icoutput;
ifp->if_hdrlen = 0;
ifp->if_addrlen = 0;
- ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
+ ifp->if_snd.ifq_maxlen = ifqmaxlen;
if_attach(ifp);
diff --git a/sys/dev/ipw/if_ipw.c b/sys/dev/ipw/if_ipw.c
index 66d7b4fac7e5..cfeb49a6b81e 100644
--- a/sys/dev/ipw/if_ipw.c
+++ b/sys/dev/ipw/if_ipw.c
@@ -287,8 +287,8 @@ ipw_attach(device_t dev)
ifp->if_init = ipw_init;
ifp->if_ioctl = ipw_ioctl;
ifp->if_start = ipw_start;
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
- ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN;
+ IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen);
+ ifp->if_snd.ifq_drv_maxlen = ifqmaxlen;
IFQ_SET_READY(&ifp->if_snd);
ic->ic_ifp = ifp;
diff --git a/sys/dev/iwi/if_iwi.c b/sys/dev/iwi/if_iwi.c
index 53e8a399a1db..a4353ffdb1b7 100644
--- a/sys/dev/iwi/if_iwi.c
+++ b/sys/dev/iwi/if_iwi.c
@@ -368,8 +368,8 @@ iwi_attach(device_t dev)
ifp->if_init = iwi_init;
ifp->if_ioctl = iwi_ioctl;
ifp->if_start = iwi_start;
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
- ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN;
+ IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen);
+ ifp->if_snd.ifq_drv_maxlen = ifqmaxlen;
IFQ_SET_READY(&ifp->if_snd);
ic->ic_wme.wme_update = iwi_wme_update;
diff --git a/sys/dev/le/lance.c b/sys/dev/le/lance.c
index 68673a9c5b01..f2012ae962a5 100644
--- a/sys/dev/le/lance.c
+++ b/sys/dev/le/lance.c
@@ -133,8 +133,8 @@ lance_config(struct lance_softc *sc, const char* name, int unit)
ifp->if_flags &= ~IFF_MULTICAST;
#endif
ifp->if_baudrate = IF_Mbps(10);
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
- ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN;
+ IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen);
+ ifp->if_snd.ifq_drv_maxlen = ifqmaxlen;
IFQ_SET_READY(&ifp->if_snd);
/* Initialize ifmedia structures. */
diff --git a/sys/dev/malo/if_malo.c b/sys/dev/malo/if_malo.c
index a1a628529d13..dc70a7a575cb 100644
--- a/sys/dev/malo/if_malo.c
+++ b/sys/dev/malo/if_malo.c
@@ -243,8 +243,8 @@ malo_attach(uint16_t devid, struct malo_softc *sc)
ifp->if_watchdog = malo_watchdog;
ifp->if_ioctl = malo_ioctl;
ifp->if_init = malo_init;
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
- ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN;
+ IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen);
+ ifp->if_snd.ifq_drv_maxlen = ifqmaxlen;
IFQ_SET_READY(&ifp->if_snd);
/* NB: firmware looks that it does not export regdomain info API. */
diff --git a/sys/dev/my/if_my.c b/sys/dev/my/if_my.c
index e755faecbef4..e55f7310b257 100644
--- a/sys/dev/my/if_my.c
+++ b/sys/dev/my/if_my.c
@@ -889,8 +889,8 @@ my_attach(device_t dev)
ifp->if_watchdog = my_watchdog;
ifp->if_init = my_init;
ifp->if_baudrate = 10000000;
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
- ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN;
+ IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen);
+ ifp->if_snd.ifq_drv_maxlen = ifqmaxlen;
IFQ_SET_READY(&ifp->if_snd);
if (sc->my_info->my_did == MTD803ID)
diff --git a/sys/dev/nxge/if_nxge.c b/sys/dev/nxge/if_nxge.c
index 95f97a8923b4..96c8664395f9 100644
--- a/sys/dev/nxge/if_nxge.c
+++ b/sys/dev/nxge/if_nxge.c
@@ -1190,7 +1190,7 @@ xge_interface_setup(device_t dev)
ifnetp->if_start = xge_send;
/* TODO: Check and assign optimal value */
- ifnetp->if_snd.ifq_maxlen = IFQ_MAXLEN;
+ ifnetp->if_snd.ifq_maxlen = ifqmaxlen;
ifnetp->if_capabilities = IFCAP_VLAN_HWTAGGING | IFCAP_VLAN_MTU |
IFCAP_HWCSUM;
diff --git a/sys/dev/pdq/pdq_ifsubr.c b/sys/dev/pdq/pdq_ifsubr.c
index ce1a2087bbd7..04dbb248c1e4 100644
--- a/sys/dev/pdq/pdq_ifsubr.c
+++ b/sys/dev/pdq/pdq_ifsubr.c
@@ -423,7 +423,7 @@ pdq_ifattach(pdq_softc_t *sc, const pdq_uint8_t *llc)
ifp->if_softc = sc;
ifp->if_init = (if_init_f_t *)pdq_ifinit;
- ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
+ ifp->if_snd.ifq_maxlen = ifqmaxlen;
ifp->if_flags = IFF_BROADCAST|IFF_SIMPLEX|IFF_NOTRAILERS|IFF_MULTICAST;
ifp->if_watchdog = pdq_ifwatchdog;
diff --git a/sys/dev/ppbus/if_plip.c b/sys/dev/ppbus/if_plip.c
index dfee00d2e919..d9c96d74a17e 100644
--- a/sys/dev/ppbus/if_plip.c
+++ b/sys/dev/ppbus/if_plip.c
@@ -248,7 +248,7 @@ lp_attach (device_t dev)
ifp->if_output = lpoutput;
ifp->if_hdrlen = 0;
ifp->if_addrlen = 0;
- ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
+ ifp->if_snd.ifq_maxlen = ifqmaxlen;
if_attach(ifp);
bpfattach(ifp, DLT_NULL, sizeof(u_int32_t));
diff --git a/sys/dev/ral/rt2560.c b/sys/dev/ral/rt2560.c
index 16e946e9d852..b0f260cf6f78 100644
--- a/sys/dev/ral/rt2560.c
+++ b/sys/dev/ral/rt2560.c
@@ -261,8 +261,8 @@ rt2560_attach(device_t dev, int id)
ifp->if_init = rt2560_init;
ifp->if_ioctl = rt2560_ioctl;
ifp->if_start = rt2560_start;
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
- ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN;
+ IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen);
+ ifp->if_snd.ifq_drv_maxlen = ifqmaxlen;
IFQ_SET_READY(&ifp->if_snd);
ic->ic_ifp = ifp;
diff --git a/sys/dev/ral/rt2661.c b/sys/dev/ral/rt2661.c
index 44a66127832f..2f69b9615e40 100644
--- a/sys/dev/ral/rt2661.c
+++ b/sys/dev/ral/rt2661.c
@@ -285,8 +285,8 @@ rt2661_attach(device_t dev, int id)
ifp->if_init = rt2661_init;
ifp->if_ioctl = rt2661_ioctl;
ifp->if_start = rt2661_start;
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
- ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN;
+ IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen);
+ ifp->if_snd.ifq_drv_maxlen = ifqmaxlen;
IFQ_SET_READY(&ifp->if_snd);
ic->ic_ifp = ifp;
diff --git a/sys/dev/ray/if_ray.c b/sys/dev/ray/if_ray.c
index 0742c7c9e976..d47fc34b528f 100644
--- a/sys/dev/ray/if_ray.c
+++ b/sys/dev/ray/if_ray.c
@@ -534,7 +534,7 @@ ray_attach(device_t dev)
ifp->if_ioctl = ray_ioctl;
ifp->if_watchdog = ray_watchdog;
ifp->if_init = ray_init;
- ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
+ ifp->if_snd.ifq_maxlen = ifqmaxlen;
ether_ifattach(ifp, ep->e_station_addr);
diff --git a/sys/dev/sbni/if_sbni.c b/sys/dev/sbni/if_sbni.c
index a4916fd31bd2..c0e2a261e8d7 100644
--- a/sys/dev/sbni/if_sbni.c
+++ b/sys/dev/sbni/if_sbni.c
@@ -235,7 +235,7 @@ sbni_attach(struct sbni_softc *sc, int unit, struct sbni_flags flags)
ifp->if_start = sbni_start;
ifp->if_ioctl = sbni_ioctl;
ifp->if_watchdog = sbni_watchdog;
- ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
+ ifp->if_snd.ifq_maxlen = ifqmaxlen;
/* report real baud rate */
csr0 = sbni_inb(sc, CSR0);
diff --git a/sys/dev/sbsh/if_sbsh.c b/sys/dev/sbsh/if_sbsh.c
index 27565a774493..be091bbf4163 100644
--- a/sys/dev/sbsh/if_sbsh.c
+++ b/sys/dev/sbsh/if_sbsh.c
@@ -288,7 +288,7 @@ sbsh_attach(device_t dev)
ifp->if_watchdog = sbsh_watchdog;
ifp->if_init = sbsh_init;
ifp->if_baudrate = 4600000;
- ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
+ ifp->if_snd.ifq_maxlen = ifqmaxlen;
ether_ifattach(ifp, eaddr);
diff --git a/sys/dev/sn/if_sn.c b/sys/dev/sn/if_sn.c
index 42da0dd9f98b..1e5291bd2d43 100644
--- a/sys/dev/sn/if_sn.c
+++ b/sys/dev/sn/if_sn.c
@@ -205,8 +205,8 @@ sn_attach(device_t dev)
ifp->if_watchdog = snwatchdog;
ifp->if_init = sninit;
ifp->if_baudrate = 10000000;
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
- ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
+ IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen);
+ ifp->if_snd.ifq_maxlen = ifqmaxlen;
IFQ_SET_READY(&ifp->if_snd);
ifp->if_timer = 0;
diff --git a/sys/dev/snc/dp83932.c b/sys/dev/snc/dp83932.c
index e6c0dd64314a..e0b9f4284306 100644
--- a/sys/dev/snc/dp83932.c
+++ b/sys/dev/snc/dp83932.c
@@ -186,7 +186,7 @@ sncconfig(sc, media, nmedia, defmedia, myea)
ifp->if_watchdog = sncwatchdog;
ifp->if_init = sncinit;
ifp->if_mtu = ETHERMTU;
- ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
+ ifp->if_snd.ifq_maxlen = ifqmaxlen;
/* Initialize media goo. */
ifmedia_init(&sc->sc_media, 0, snc_mediachange,
diff --git a/sys/dev/sr/if_sr.c b/sys/dev/sr/if_sr.c
index 2711dfeaaa35..4408677ec847 100644
--- a/sys/dev/sr/if_sr.c
+++ b/sys/dev/sr/if_sr.c
@@ -440,8 +440,8 @@ sr_attach(device_t device)
}
NG_NODE_SET_PRIVATE(sc->node, sc);
callout_handle_init(&sc->handle);
- sc->xmitq.ifq_maxlen = IFQ_MAXLEN;
- sc->xmitq_hipri.ifq_maxlen = IFQ_MAXLEN;
+ sc->xmitq.ifq_maxlen = ifqmaxlen;
+ sc->xmitq_hipri.ifq_maxlen = ifqmaxlen;
mtx_init(&sc->xmitq.ifq_mtx, "sr_xmitq", NULL, MTX_DEF);
mtx_init(&sc->xmitq_hipri.ifq_mtx, "sr_xmitq_hipri", NULL,
MTX_DEF);
diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c
index 71e2439c174a..67e88a57924b 100644
--- a/sys/dev/usb/if_aue.c
+++ b/sys/dev/usb/if_aue.c
@@ -724,8 +724,8 @@ aue_attach(device_t self)
ifp->if_ioctl = aue_ioctl;
ifp->if_start = aue_start;
ifp->if_init = aue_init;
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
- ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN;
+ IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen);
+ ifp->if_snd.ifq_drv_maxlen = ifqmaxlen;
IFQ_SET_READY(&ifp->if_snd);
/*
diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c
index d1b0c9489a9a..bd2204c29f32 100644
--- a/sys/dev/usb/if_axe.c
+++ b/sys/dev/usb/if_axe.c
@@ -653,8 +653,8 @@ device_printf(sc->axe_dev, "%s, bufsz %d, boundary %d\n",
ifp->if_start = axe_start;
ifp->if_watchdog = axe_watchdog;
ifp->if_init = axe_init;
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
- ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN;
+ IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen);
+ ifp->if_snd.ifq_drv_maxlen = ifqmaxlen;
IFQ_SET_READY(&ifp->if_snd);
error = mii_attach(self, &sc->axe_miibus, ifp, axe_ifmedia_upd,
diff --git a/sys/dev/usb/if_cdce.c b/sys/dev/usb/if_cdce.c
index d41a54f0cc0b..48e8ee833610 100644
--- a/sys/dev/usb/if_cdce.c
+++ b/sys/dev/usb/if_cdce.c
@@ -322,7 +322,7 @@ cdce_attach(device_t self)
ifp->if_start = cdce_start;
ifp->if_init = cdce_init;
ifp->if_baudrate = 11000000;
- ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
+ ifp->if_snd.ifq_maxlen = ifqmaxlen;
sc->q.ifp = ifp;
sc->q.if_rxstart = cdce_rxstart;
diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c
index cd3a5432ef16..5508b3d43a1e 100644
--- a/sys/dev/usb/if_cue.c
+++ b/sys/dev/usb/if_cue.c
@@ -501,7 +501,7 @@ cue_attach(device_t self)
ifp->if_watchdog = cue_watchdog;
ifp->if_init = cue_init;
ifp->if_baudrate = 10000000;
- ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
+ ifp->if_snd.ifq_maxlen = ifqmaxlen;
sc->cue_qdat.ifp = ifp;
sc->cue_qdat.if_rxstart = cue_rxstart;
diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c
index f68eaa831f77..78a4f219865f 100644
--- a/sys/dev/usb/if_kue.c
+++ b/sys/dev/usb/if_kue.c
@@ -488,7 +488,7 @@ kue_attach(device_t self)
ifp->if_watchdog = kue_watchdog;
ifp->if_init = kue_init;
ifp->if_baudrate = 10000000;
- ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
+ ifp->if_snd.ifq_maxlen = ifqmaxlen;
sc->kue_qdat.ifp = ifp;
sc->kue_qdat.if_rxstart = kue_rxstart;
diff --git a/sys/dev/usb/if_rue.c b/sys/dev/usb/if_rue.c
index 7ee7c9acc9d0..34485fb54776 100644
--- a/sys/dev/usb/if_rue.c
+++ b/sys/dev/usb/if_rue.c
@@ -664,7 +664,7 @@ rue_attach(device_t self)
ifp->if_start = rue_start;
ifp->if_watchdog = rue_watchdog;
ifp->if_init = rue_init;
- ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
+ ifp->if_snd.ifq_maxlen = ifqmaxlen;
/*
* MII setup
diff --git a/sys/dev/usb/if_rum.c b/sys/dev/usb/if_rum.c
index bf825e26cebc..edd695a896d5 100644
--- a/sys/dev/usb/if_rum.c
+++ b/sys/dev/usb/if_rum.c
@@ -482,8 +482,8 @@ rum_attach(device_t self)
ifp->if_init = rum_init;
ifp->if_ioctl = rum_ioctl;
ifp->if_start = rum_start;
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
- ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN;
+ IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen);
+ ifp->if_snd.ifq_drv_maxlen = ifqmaxlen;
IFQ_SET_READY(&ifp->if_snd);
ic->ic_ifp = ifp;
diff --git a/sys/dev/usb/if_udav.c b/sys/dev/usb/if_udav.c
index 51c8efd13c27..f4330ee5c7ef 100644
--- a/sys/dev/usb/if_udav.c
+++ b/sys/dev/usb/if_udav.c
@@ -417,7 +417,7 @@ udav_attach(device_t self)
ifp->if_stop = udav_stop;
#endif
#if defined(__FreeBSD__)
- ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
+ ifp->if_snd.ifq_maxlen = ifqmaxlen;
#endif
#if defined(__NetBSD__)
IFQ_SET_READY(&ifp->if_snd);
diff --git a/sys/dev/usb/if_ural.c b/sys/dev/usb/if_ural.c
index 819a730dec89..09829232f0fa 100644
--- a/sys/dev/usb/if_ural.c
+++ b/sys/dev/usb/if_ural.c
@@ -470,8 +470,8 @@ ural_attach(device_t self)
ifp->if_init = ural_init;
ifp->if_ioctl = ural_ioctl;
ifp->if_start = ural_start;
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
- ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN;
+ IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen);
+ ifp->if_snd.ifq_drv_maxlen = ifqmaxlen;
IFQ_SET_READY(&ifp->if_snd);
ic->ic_ifp = ifp;
diff --git a/sys/dev/usb/if_zyd.c b/sys/dev/usb/if_zyd.c
index 5d938392fe3f..7fdc8e0feebb 100644
--- a/sys/dev/usb/if_zyd.c
+++ b/sys/dev/usb/if_zyd.c
@@ -307,7 +307,7 @@ zyd_attach(device_t dev)
ifp->if_init = zyd_init;
ifp->if_ioctl = zyd_ioctl;
ifp->if_start = zyd_start;
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
+ IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen);
IFQ_SET_READY(&ifp->if_snd);
STAILQ_INIT(&sc->sc_rqh);
diff --git a/sys/dev/usb/udbp.c b/sys/dev/usb/udbp.c
index 2ca437541aec..b574dcb152d5 100644
--- a/sys/dev/usb/udbp.c
+++ b/sys/dev/usb/udbp.c
@@ -387,8 +387,8 @@ udbp_attach(device_t self)
goto bad;
} else {
NG_NODE_SET_PRIVATE(sc->node, sc);
- sc->xmitq.ifq_maxlen = IFQ_MAXLEN;
- sc->xmitq_hipri.ifq_maxlen = IFQ_MAXLEN;
+ sc->xmitq.ifq_maxlen = ifqmaxlen;
+ sc->xmitq_hipri.ifq_maxlen = ifqmaxlen;
mtx_init(&sc->xmitq.ifq_mtx, "usb_xmitq", NULL,
MTX_DEF);
mtx_init(&sc->xmitq_hipri.ifq_mtx,
diff --git a/sys/dev/vx/if_vx.c b/sys/dev/vx/if_vx.c
index c810c711d096..bfcfa99ac521 100644
--- a/sys/dev/vx/if_vx.c
+++ b/sys/dev/vx/if_vx.c
@@ -188,7 +188,7 @@ vx_attach(device_t dev)
}
ifp->if_mtu = ETHERMTU;
- ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
+ ifp->if_snd.ifq_maxlen = ifqmaxlen;
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
ifp->if_start = vx_start;
ifp->if_ioctl = vx_ioctl;
diff --git a/sys/dev/wi/if_wi.c b/sys/dev/wi/if_wi.c
index 9ff16a42159f..42bfd4d75c79 100644
--- a/sys/dev/wi/if_wi.c
+++ b/sys/dev/wi/if_wi.c
@@ -328,8 +328,8 @@ wi_attach(device_t dev)
ifp->if_ioctl = wi_ioctl;
ifp->if_start = wi_start;
ifp->if_init = wi_init;
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
- ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN;
+ IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen);
+ ifp->if_snd.ifq_drv_maxlen = ifqmaxlen;
IFQ_SET_READY(&ifp->if_snd);
ic->ic_ifp = ifp;
diff --git a/sys/dev/wl/if_wl.c b/sys/dev/wl/if_wl.c
index 17ad81a3e2fa..b9fca529bb44 100644
--- a/sys/dev/wl/if_wl.c
+++ b/sys/dev/wl/if_wl.c
@@ -560,7 +560,7 @@ wlattach(device_t device)
ifp->if_start = wlstart;
ifp->if_ioctl = wlioctl;
ifp->if_timer = 0; /* paranoia */
- ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
+ ifp->if_snd.ifq_maxlen = ifqmaxlen;
/* no entries
ifp->if_watchdog
ifp->if_done
diff --git a/sys/dev/wpi/if_wpi.c b/sys/dev/wpi/if_wpi.c
index 7df317bac1bc..c54a66c07bfb 100644
--- a/sys/dev/wpi/if_wpi.c
+++ b/sys/dev/wpi/if_wpi.c
@@ -660,8 +660,8 @@ wpi_attach(device_t dev)
ifp->if_init = wpi_init;
ifp->if_ioctl = wpi_ioctl;
ifp->if_start = wpi_start;
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
- ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN;
+ IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen);
+ ifp->if_snd.ifq_drv_maxlen = ifqmaxlen;
IFQ_SET_READY(&ifp->if_snd);
ieee80211_ifattach(ic);
diff --git a/sys/dev/xe/if_xe.c b/sys/dev/xe/if_xe.c
index accaafec8082..20a16de51e25 100644
--- a/sys/dev/xe/if_xe.c
+++ b/sys/dev/xe/if_xe.c
@@ -245,7 +245,7 @@ xe_attach (device_t dev)
scp->ifp->if_watchdog = xe_watchdog;
scp->ifp->if_init = xe_init;
scp->ifp->if_baudrate = 100000000;
- scp->ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
+ scp->ifp->if_snd.ifq_maxlen = ifqmaxlen;
/* Initialise the ifmedia structure */
ifmedia_init(scp->ifm, 0, xe_media_change, xe_media_status);
diff --git a/sys/i4b/capi/capi_l4if.c b/sys/i4b/capi/capi_l4if.c
index ef652640cfeb..64627a07b1d1 100644
--- a/sys/i4b/capi/capi_l4if.c
+++ b/sys/i4b/capi/capi_l4if.c
@@ -93,13 +93,13 @@ i4b_capi_bch_config(int unit, int chan, int bprot, int activate)
capi_softc_t *sc = capi_sc[unit];
i4b_Bcleanifq(&sc->sc_bchan[chan].tx_queue);
- sc->sc_bchan[chan].tx_queue.ifq_maxlen = IFQ_MAXLEN;
+ sc->sc_bchan[chan].tx_queue.ifq_maxlen = ifqmaxlen;
sc->sc_bchan[chan].txcount = 0;
/* The telephony drivers use rx_queue for receive. */
i4b_Bcleanifq(&sc->sc_bchan[chan].rx_queue);
- sc->sc_bchan[chan].rx_queue.ifq_maxlen = IFQ_MAXLEN;
+ sc->sc_bchan[chan].rx_queue.ifq_maxlen = ifqmaxlen;
sc->sc_bchan[chan].rxcount = 0;
/* HDLC frames are put to in_mbuf */
@@ -235,8 +235,8 @@ capi_ll_attach(capi_softc_t *sc)
memset(&sc->sc_bchan[i].tx_queue, 0, sizeof(struct ifqueue));
memset(&sc->sc_bchan[i].rx_queue, 0, sizeof(struct ifqueue));
- sc->sc_bchan[i].tx_queue.ifq_maxlen = IFQ_MAXLEN;
- sc->sc_bchan[i].rx_queue.ifq_maxlen = IFQ_MAXLEN;
+ sc->sc_bchan[i].tx_queue.ifq_maxlen = ifqmaxlen;
+ sc->sc_bchan[i].rx_queue.ifq_maxlen = ifqmaxlen;
if(!mtx_initialized(&sc->sc_bchan[i].tx_queue.ifq_mtx))
mtx_init(&sc->sc_bchan[i].tx_queue.ifq_mtx, "i4b_capi_tx", NULL, MTX_DEF);
diff --git a/sys/i4b/driver/i4b_ing.c b/sys/i4b/driver/i4b_ing.c
index 4c3aa6ace0c5..3f7d09c5c548 100644
--- a/sys/i4b/driver/i4b_ing.c
+++ b/sys/i4b/driver/i4b_ing.c
@@ -281,8 +281,8 @@ i4bingattach(void *dummy)
NG_NODE_SET_PRIVATE(sc->node, sc);
- sc->xmitq.ifq_maxlen = IFQ_MAXLEN;
- sc->xmitq_hipri.ifq_maxlen = IFQ_MAXLEN;
+ sc->xmitq.ifq_maxlen = ifqmaxlen;
+ sc->xmitq_hipri.ifq_maxlen = ifqmaxlen;
if(!mtx_initialized(&sc->xmitq.ifq_mtx))
mtx_init(&sc->xmitq.ifq_mtx, "i4b_ing_xmitq", NULL, MTX_DEF);
if(!mtx_initialized(&sc->xmitq_hipri.ifq_mtx))
diff --git a/sys/i4b/driver/i4b_isppp.c b/sys/i4b/driver/i4b_isppp.c
index e971f33b1027..650406a48dbf 100644
--- a/sys/i4b/driver/i4b_isppp.c
+++ b/sys/i4b/driver/i4b_isppp.c
@@ -187,7 +187,7 @@ i4bispppattach(void *dummy)
ifp->if_hdrlen = 0;
ifp->if_addrlen = 0;
- ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
+ ifp->if_snd.ifq_maxlen = ifqmaxlen;
ifp->if_ipackets = 0;
ifp->if_ierrors = 0;
diff --git a/sys/i4b/driver/i4b_trace.c b/sys/i4b/driver/i4b_trace.c
index 80f9b6e534a2..4daece51adfe 100644
--- a/sys/i4b/driver/i4b_trace.c
+++ b/sys/i4b/driver/i4b_trace.c
@@ -105,7 +105,7 @@ i4btrcattach(void *dummy)
{
make_dev(&i4btrc_cdevsw, i,
UID_ROOT, GID_WHEEL, 0600, "i4btrc%d", i);
- trace_queue[i].ifq_maxlen = IFQ_MAXLEN;
+ trace_queue[i].ifq_maxlen = ifqmaxlen;
if(!mtx_initialized(&trace_queue[i].ifq_mtx))
mtx_init(&trace_queue[i].ifq_mtx, "i4b_trace", NULL, MTX_DEF);
diff --git a/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c b/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c
index 2b674320495e..4f765c9fbc37 100644
--- a/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c
+++ b/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c
@@ -1137,7 +1137,7 @@ avma1pp_bchannel_setup(int unit, int h_chan, int bprot, int activate)
/* receiver part */
- chan->rx_queue.ifq_maxlen = IFQ_MAXLEN;
+ chan->rx_queue.ifq_maxlen = ifqmaxlen;
i4b_Bcleanifq(&chan->rx_queue); /* clean rx queue */
@@ -1151,7 +1151,7 @@ avma1pp_bchannel_setup(int unit, int h_chan, int bprot, int activate)
/* transmitter part */
- chan->tx_queue.ifq_maxlen = IFQ_MAXLEN;
+ chan->tx_queue.ifq_maxlen = ifqmaxlen;
i4b_Bcleanifq(&chan->tx_queue); /* clean tx queue */
diff --git a/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c b/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c
index e8dbbde58e05..a2abfa7b6d00 100644
--- a/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c
+++ b/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c
@@ -1084,7 +1084,7 @@ avma1pp2_bchannel_setup(int unit, int h_chan, int bprot, int activate)
/* receiver part */
- chan->rx_queue.ifq_maxlen = IFQ_MAXLEN;
+ chan->rx_queue.ifq_maxlen = ifqmaxlen;
i4b_Bcleanifq(&chan->rx_queue); /* clean rx queue */
@@ -1098,7 +1098,7 @@ avma1pp2_bchannel_setup(int unit, int h_chan, int bprot, int activate)
/* transmitter part */
- chan->tx_queue.ifq_maxlen = IFQ_MAXLEN;
+ chan->tx_queue.ifq_maxlen = ifqmaxlen;
i4b_Bcleanifq(&chan->tx_queue); /* clean tx queue */
diff --git a/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c b/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c
index fc06acfc27c6..8ac64c38c483 100644
--- a/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c
+++ b/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c
@@ -1047,7 +1047,7 @@ avm_pnp_bchannel_setup(int unit, int h_chan, int bprot, int activate)
/* receiver part */
- chan->rx_queue.ifq_maxlen = IFQ_MAXLEN;
+ chan->rx_queue.ifq_maxlen = ifqmaxlen;
#if defined (__FreeBSD__) && __FreeBSD__ > 4
if(!mtx_initialized(&chan->rx_queue.ifq_mtx))
@@ -1066,7 +1066,7 @@ avm_pnp_bchannel_setup(int unit, int h_chan, int bprot, int activate)
/* transmitter part */
- chan->tx_queue.ifq_maxlen = IFQ_MAXLEN;
+ chan->tx_queue.ifq_maxlen = ifqmaxlen;
#if defined (__FreeBSD__) && __FreeBSD__ > 4
if(!mtx_initialized(&chan->tx_queue.ifq_mtx))
diff --git a/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c b/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c
index 630aa6716dab..fc3fd080edf2 100644
--- a/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c
+++ b/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c
@@ -354,7 +354,7 @@ ihfc_init (ihfc_sc_t *sc, u_char chan, int prot, int activate)
RESET_SOFT_CHAN(sc, chan);
- S_IFQUEUE.ifq_maxlen = IFQ_MAXLEN;
+ S_IFQUEUE.ifq_maxlen = ifqmaxlen;
#if defined (__FreeBSD__) && __FreeBSD__ > 4
if(!mtx_initialized(&S_IFQUEUE.ifq_mtx))
@@ -380,7 +380,7 @@ ihfc_init (ihfc_sc_t *sc, u_char chan, int prot, int activate)
RESET_SOFT_CHAN(sc, chan);
- S_IFQUEUE.ifq_maxlen = IFQ_MAXLEN;
+ S_IFQUEUE.ifq_maxlen = ifqmaxlen;
#if defined (__FreeBSD__) && __FreeBSD__ > 4
if(!mtx_initialized(&S_IFQUEUE.ifq_mtx))
diff --git a/sys/i4b/layer1/isic/i4b_bchan.c b/sys/i4b/layer1/isic/i4b_bchan.c
index 5dbffca2ac62..1b80bdcdf65d 100644
--- a/sys/i4b/layer1/isic/i4b_bchan.c
+++ b/sys/i4b/layer1/isic/i4b_bchan.c
@@ -84,7 +84,7 @@ isic_bchannel_setup(int unit, int h_chan, int bprot, int activate)
/* receiver part */
- chan->rx_queue.ifq_maxlen = IFQ_MAXLEN;
+ chan->rx_queue.ifq_maxlen = ifqmaxlen;
if(!mtx_initialized(&chan->rx_queue.ifq_mtx))
mtx_init(&chan->rx_queue.ifq_mtx, "i4b_isic_rx", NULL, MTX_DEF);
@@ -101,7 +101,7 @@ isic_bchannel_setup(int unit, int h_chan, int bprot, int activate)
/* transmitter part */
- chan->tx_queue.ifq_maxlen = IFQ_MAXLEN;
+ chan->tx_queue.ifq_maxlen = ifqmaxlen;
if(!mtx_initialized(&chan->tx_queue.ifq_mtx))
mtx_init(&chan->tx_queue.ifq_mtx, "i4b_isic_tx", NULL, MTX_DEF);
diff --git a/sys/i4b/layer1/itjc/i4b_itjc_pci.c b/sys/i4b/layer1/itjc/i4b_itjc_pci.c
index 6d255af43be1..a5d20ed5af3c 100644
--- a/sys/i4b/layer1/itjc/i4b_itjc_pci.c
+++ b/sys/i4b/layer1/itjc/i4b_itjc_pci.c
@@ -1858,7 +1858,7 @@ itjc_bchannel_setup(int unit, int h_chan, int bprot, int activate)
i4b_Bcleanifq(&chan->rx_queue); /* clean rx queue */
- chan->rx_queue.ifq_maxlen = IFQ_MAXLEN;
+ chan->rx_queue.ifq_maxlen = ifqmaxlen;
chan->rxcount = 0; /* reset rx counter */
@@ -1872,7 +1872,7 @@ itjc_bchannel_setup(int unit, int h_chan, int bprot, int activate)
i4b_Bcleanifq(&chan->tx_queue); /* clean tx queue */
- chan->tx_queue.ifq_maxlen = IFQ_MAXLEN;
+ chan->tx_queue.ifq_maxlen = ifqmaxlen;
chan->txcount = 0; /* reset tx counter */
diff --git a/sys/i4b/layer1/iwic/i4b_iwic_bchan.c b/sys/i4b/layer1/iwic/i4b_iwic_bchan.c
index 66b1b537d6b8..a73b8729f401 100644
--- a/sys/i4b/layer1/iwic/i4b_iwic_bchan.c
+++ b/sys/i4b/layer1/iwic/i4b_iwic_bchan.c
@@ -428,7 +428,7 @@ iwic_bchannel_setup(int unit, int chan_no, int bprot, int activate)
/* receiver part */
- chan->rx_queue.ifq_maxlen = IFQ_MAXLEN;
+ chan->rx_queue.ifq_maxlen = ifqmaxlen;
#if defined (__FreeBSD__) && __FreeBSD__ > 4
if(!mtx_initialized(&chan->rx_queue.ifq_mtx))
@@ -447,7 +447,7 @@ iwic_bchannel_setup(int unit, int chan_no, int bprot, int activate)
/* transmitter part */
- chan->tx_queue.ifq_maxlen = IFQ_MAXLEN;
+ chan->tx_queue.ifq_maxlen = ifqmaxlen;
#if defined (__FreeBSD__) && __FreeBSD__ > 4
if(!mtx_initialized(&chan->tx_queue.ifq_mtx))
diff --git a/sys/i4b/layer4/i4b_i4bdrv.c b/sys/i4b/layer4/i4b_i4bdrv.c
index ef73ce162be1..f5efd00a6e38 100644
--- a/sys/i4b/layer4/i4b_i4bdrv.c
+++ b/sys/i4b/layer4/i4b_i4bdrv.c
@@ -96,7 +96,7 @@ i4battach(void *dummy)
{
printf("i4b: ISDN call control device attached\n");
- i4b_rdqueue.ifq_maxlen = IFQ_MAXLEN;
+ i4b_rdqueue.ifq_maxlen = ifqmaxlen;
if(!mtx_initialized(&i4b_rdqueue.ifq_mtx))
mtx_init(&i4b_rdqueue.ifq_mtx, "i4b_rdqueue", NULL, MTX_DEF);
diff --git a/sys/net/if.c b/sys/net/if.c
index f82b09579175..77d4ec332f36 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -89,6 +89,10 @@ static int slowtimo_started;
SYSCTL_NODE(_net, PF_LINK, link, CTLFLAG_RW, 0, "Link layers");
SYSCTL_NODE(_net_link, 0, generic, CTLFLAG_RW, 0, "Generic link-management");
+TUNABLE_INT("net.link.ifqmaxlen", &ifqmaxlen);
+SYSCTL_UINT(_net_link, OID_AUTO, ifqmaxlen, CTLFLAG_RDTUN,
+ &ifqmaxlen, 0, "max send queue size");
+
/* Log link state change events */
static int log_link_state_change = 1;
diff --git a/sys/net/if_ef.c b/sys/net/if_ef.c
index 19c16874c28d..e8fd4f8b807b 100644
--- a/sys/net/if_ef.c
+++ b/sys/net/if_ef.c
@@ -130,7 +130,7 @@ ef_attach(struct efnet *sc)
ifp->if_start = ef_start;
ifp->if_watchdog = NULL;
ifp->if_init = ef_init;
- ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
+ ifp->if_snd.ifq_maxlen = ifqmaxlen;
ifp->if_flags = (IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST);
/*
* Attach the interface
diff --git a/sys/net/if_gif.c b/sys/net/if_gif.c
index ade721c0339a..a0a5dd44a253 100644
--- a/sys/net/if_gif.c
+++ b/sys/net/if_gif.c
@@ -182,7 +182,7 @@ gif_clone_create(ifc, unit, params)
GIF2IFP(sc)->if_ioctl = gif_ioctl;
GIF2IFP(sc)->if_start = gif_start;
GIF2IFP(sc)->if_output = gif_output;
- GIF2IFP(sc)->if_snd.ifq_maxlen = IFQ_MAXLEN;
+ GIF2IFP(sc)->if_snd.ifq_maxlen = ifqmaxlen;
if_attach(GIF2IFP(sc));
bpfattach(GIF2IFP(sc), DLT_NULL, sizeof(u_int32_t));
if (ng_gif_attach_p != NULL)
diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c
index 98f87f028fc2..0b3ba040f39d 100644
--- a/sys/net/if_gre.c
+++ b/sys/net/if_gre.c
@@ -190,7 +190,7 @@ gre_clone_create(ifc, unit, params)
GRE2IFP(sc)->if_softc = sc;
if_initname(GRE2IFP(sc), ifc->ifc_name, unit);
- GRE2IFP(sc)->if_snd.ifq_maxlen = IFQ_MAXLEN;
+ GRE2IFP(sc)->if_snd.ifq_maxlen = ifqmaxlen;
GRE2IFP(sc)->if_addrlen = 0;
GRE2IFP(sc)->if_hdrlen = 24; /* IP + GRE */
GRE2IFP(sc)->if_mtu = GREMTU;
diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c
index 462b7c55b688..ca9d9733340e 100644
--- a/sys/net/if_ppp.c
+++ b/sys/net/if_ppp.c
@@ -228,10 +228,10 @@ ppp_clone_create(struct if_clone *ifc, int unit, caddr_t params)
ifp->if_hdrlen = PPP_HDRLEN;
ifp->if_ioctl = pppsioctl;
ifp->if_output = pppoutput;
- ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
- sc->sc_inq.ifq_maxlen = IFQ_MAXLEN;
- sc->sc_fastq.ifq_maxlen = IFQ_MAXLEN;
- sc->sc_rawq.ifq_maxlen = IFQ_MAXLEN;
+ ifp->if_snd.ifq_maxlen = ifqmaxlen;
+ sc->sc_inq.ifq_maxlen = ifqmaxlen;
+ sc->sc_fastq.ifq_maxlen = ifqmaxlen;
+ sc->sc_rawq.ifq_maxlen = ifqmaxlen;
mtx_init(&sc->sc_inq.ifq_mtx, "ppp_inq", NULL, MTX_DEF);
mtx_init(&sc->sc_fastq.ifq_mtx, "ppp_fastq", NULL, MTX_DEF);
mtx_init(&sc->sc_rawq.ifq_mtx, "ppp_rawq", NULL, MTX_DEF);
diff --git a/sys/net/if_stf.c b/sys/net/if_stf.c
index 036976f8c419..b3c9f1bd7481 100644
--- a/sys/net/if_stf.c
+++ b/sys/net/if_stf.c
@@ -252,7 +252,7 @@ stf_clone_create(struct if_clone *ifc, char *name, size_t len, caddr_t params)
ifp->if_mtu = IPV6_MMTU;
ifp->if_ioctl = stf_ioctl;
ifp->if_output = stf_output;
- ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
+ ifp->if_snd.ifq_maxlen = ifqmaxlen;
if_attach(ifp);
bpfattach(ifp, DLT_NULL, sizeof(u_int32_t));
return (0);
diff --git a/sys/netatalk/ddp_usrreq.c b/sys/netatalk/ddp_usrreq.c
index d5bec0bec719..a6f72256faa0 100644
--- a/sys/netatalk/ddp_usrreq.c
+++ b/sys/netatalk/ddp_usrreq.c
@@ -256,9 +256,9 @@ void
ddp_init(void)
{
- atintrq1.ifq_maxlen = IFQ_MAXLEN;
- atintrq2.ifq_maxlen = IFQ_MAXLEN;
- aarpintrq.ifq_maxlen = IFQ_MAXLEN;
+ atintrq1.ifq_maxlen = ifqmaxlen;
+ atintrq2.ifq_maxlen = ifqmaxlen;
+ aarpintrq.ifq_maxlen = ifqmaxlen;
mtx_init(&atintrq1.ifq_mtx, "at1_inq", NULL, MTX_DEF);
mtx_init(&atintrq2.ifq_mtx, "at2_inq", NULL, MTX_DEF);
mtx_init(&aarpintrq.ifq_mtx, "aarp_inq", NULL, MTX_DEF);
diff --git a/sys/netgraph/ng_eiface.c b/sys/netgraph/ng_eiface.c
index a47aaddac81c..815c20942733 100644
--- a/sys/netgraph/ng_eiface.c
+++ b/sys/netgraph/ng_eiface.c
@@ -364,7 +364,7 @@ ng_eiface_constructor(node_p node)
ifp->if_start = ng_eiface_start;
ifp->if_ioctl = ng_eiface_ioctl;
ifp->if_watchdog = NULL;
- ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
+ ifp->if_snd.ifq_maxlen = ifqmaxlen;
ifp->if_flags = (IFF_SIMPLEX | IFF_BROADCAST | IFF_MULTICAST);
#if 0
diff --git a/sys/netgraph/ng_fec.c b/sys/netgraph/ng_fec.c
index 58f16a942d7f..6b62cd2a995c 100644
--- a/sys/netgraph/ng_fec.c
+++ b/sys/netgraph/ng_fec.c
@@ -1227,7 +1227,7 @@ ng_fec_constructor(node_p node)
ifp->if_ioctl = ng_fec_ioctl;
ifp->if_init = ng_fec_init;
ifp->if_watchdog = NULL;
- ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
+ ifp->if_snd.ifq_maxlen = ifqmaxlen;
ifp->if_mtu = NG_FEC_MTU_DEFAULT;
ifp->if_flags = (IFF_SIMPLEX|IFF_BROADCAST|IFF_MULTICAST);
ifp->if_addrlen = 0; /* XXX */
diff --git a/sys/netgraph/ng_iface.c b/sys/netgraph/ng_iface.c
index d88334d00555..5b76c29eebff 100644
--- a/sys/netgraph/ng_iface.c
+++ b/sys/netgraph/ng_iface.c
@@ -560,8 +560,8 @@ ng_iface_constructor(node_p node)
ifp->if_addrlen = 0; /* XXX */
ifp->if_hdrlen = 0; /* XXX */
ifp->if_baudrate = 64000; /* XXX */
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
- ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN;
+ IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen);
+ ifp->if_snd.ifq_drv_maxlen = ifqmaxlen;
IFQ_SET_READY(&ifp->if_snd);
/* Give this node the same name as the interface (if possible) */
diff --git a/sys/netgraph/ng_tty.c b/sys/netgraph/ng_tty.c
index 2e8d7aa6d72d..9b8e4a6be5ec 100644
--- a/sys/netgraph/ng_tty.c
+++ b/sys/netgraph/ng_tty.c
@@ -202,7 +202,7 @@ ngt_open(struct cdev *dev, struct tty *tp)
sc->tp = tp;
sc->hotchar = tp->t_hotchar = NG_TTY_DFL_HOTCHAR;
mtx_init(&sc->outq.ifq_mtx, "ng_tty node+queue", NULL, MTX_DEF);
- IFQ_SET_MAXLEN(&sc->outq, MAX_MBUFQ);
+ IFQ_SET_MAXLEN(&sc->outq, ifqmaxlen);
NGTLOCK(sc);
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index 5d781de2448d..56a879a4f591 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -132,7 +132,6 @@ SYSCTL_INT(_net_inet_ip, OID_AUTO, check_interface, CTLFLAG_RW,
struct pfil_head inet_pfil_hook; /* Packet filter hooks */
static struct ifqueue ipintrq;
-static int ipqmaxlen = IFQ_MAXLEN;
extern struct domain inetdomain;
extern struct protosw inetsw[];
@@ -264,7 +263,7 @@ ip_init(void)
/* Initialize various other remaining things. */
ip_id = time_second & 0xffff;
- ipintrq.ifq_maxlen = ipqmaxlen;
+ ipintrq.ifq_maxlen = ifqmaxlen;
mtx_init(&ipintrq.ifq_mtx, "ip_inq", NULL, MTX_DEF);
netisr_register(NETISR_IP, ip_input, &ipintrq, NETISR_MPSAFE);
}
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c
index a1c06f505d41..580a0f6c1705 100644
--- a/sys/netinet6/ip6_input.c
+++ b/sys/netinet6/ip6_input.c
@@ -115,7 +115,6 @@ extern struct domain inet6domain;
u_char ip6_protox[IPPROTO_MAX];
static struct ifqueue ip6intrq;
-static int ip6qmaxlen = IFQ_MAXLEN;
struct in6_ifaddr *in6_ifaddr;
extern struct callout in6_tmpaddrtimer_ch;
@@ -172,7 +171,7 @@ ip6_init(void)
printf("%s: WARNING: unable to register pfil hook, "
"error %d\n", __func__, i);
- ip6intrq.ifq_maxlen = ip6qmaxlen;
+ ip6intrq.ifq_maxlen = ifqmaxlen;
mtx_init(&ip6intrq.ifq_mtx, "ip6_inq", NULL, MTX_DEF);
netisr_register(NETISR_IPV6, ip6_input, &ip6intrq, 0);
scope6_init();
diff --git a/sys/netipx/ipx_input.c b/sys/netipx/ipx_input.c
index e57586cfad92..7212816f298f 100644
--- a/sys/netipx/ipx_input.c
+++ b/sys/netipx/ipx_input.c
@@ -119,7 +119,7 @@ struct mtx ipxpcb_list_mtx;
struct ipxpcbhead ipxpcb_list;
struct ipxpcbhead ipxrawpcb_list;
-static int ipxqmaxlen = IFQ_MAXLEN;
+static int ipxqmaxlen = ifqmaxlen;
static struct ifqueue ipxintrq;
long ipx_pexseq; /* Locked with ipxpcb_list_mtx. */
diff --git a/sys/pci/if_rl.c b/sys/pci/if_rl.c
index d6defa8c3c20..3e385feee455 100644
--- a/sys/pci/if_rl.c
+++ b/sys/pci/if_rl.c
@@ -960,8 +960,8 @@ rl_attach(device_t dev)
#ifdef DEVICE_POLLING
ifp->if_capabilities |= IFCAP_POLLING;
#endif
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
- ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN;
+ IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen);
+ ifp->if_snd.ifq_drv_maxlen = ifqmaxlen;
IFQ_SET_READY(&ifp->if_snd);
/*