svn commit: r215368 - in stable/7/sys: arm/at91 arm/xscale/ixp425
contrib/dev/oltr dev/ae dev/an dev/ar dev/arl dev/ath dev/awi
dev/ce dev/cm dev/cnw dev/cp dev/cs dev/ctau dev/cx dev/cxgb
dev/ed d...
Maxim Sobolev
sobomax at FreeBSD.org
Tue Nov 16 04:40:05 UTC 2010
Author: sobomax
Date: Tue Nov 16 04:40:03 2010
New Revision: 215368
URL: http://svn.freebsd.org/changeset/base/215368
Log:
MFC r207554:
Add new tunable 'net.link.ifqmaxlen' to set default send interface
queue length. The default value for this parameter is 50, which is
quite low for many of today's uses and the only way to modify this
parameter right now is to edit if_var.h file. Also add read-only
sysctl with the same name, so that it's possible to retrieve the
current value.
Modified:
stable/7/sys/arm/at91/if_ate.c
stable/7/sys/arm/xscale/ixp425/if_npe.c
stable/7/sys/contrib/dev/oltr/if_oltr.c
stable/7/sys/dev/ae/if_ae.c
stable/7/sys/dev/an/if_an.c
stable/7/sys/dev/ar/if_ar.c
stable/7/sys/dev/arl/if_arl.c
stable/7/sys/dev/ath/if_ath.c
stable/7/sys/dev/awi/awi.c
stable/7/sys/dev/ce/if_ce.c
stable/7/sys/dev/cm/smc90cx6.c
stable/7/sys/dev/cnw/if_cnw.c
stable/7/sys/dev/cp/if_cp.c
stable/7/sys/dev/cs/if_cs.c
stable/7/sys/dev/ctau/if_ct.c
stable/7/sys/dev/cx/if_cx.c
stable/7/sys/dev/cxgb/cxgb_main.c
stable/7/sys/dev/ed/if_ed.c
stable/7/sys/dev/ep/if_ep.c
stable/7/sys/dev/ex/if_ex.c
stable/7/sys/dev/ie/if_ie.c
stable/7/sys/dev/iicbus/if_ic.c
stable/7/sys/dev/ipw/if_ipw.c
stable/7/sys/dev/iwi/if_iwi.c
stable/7/sys/dev/le/lance.c
stable/7/sys/dev/malo/if_malo.c
stable/7/sys/dev/my/if_my.c
stable/7/sys/dev/nxge/if_nxge.c
stable/7/sys/dev/pdq/pdq_ifsubr.c
stable/7/sys/dev/ppbus/if_plip.c
stable/7/sys/dev/ral/rt2560.c
stable/7/sys/dev/ral/rt2661.c
stable/7/sys/dev/ray/if_ray.c
stable/7/sys/dev/sbni/if_sbni.c
stable/7/sys/dev/sbsh/if_sbsh.c
stable/7/sys/dev/sn/if_sn.c
stable/7/sys/dev/snc/dp83932.c
stable/7/sys/dev/sr/if_sr.c
stable/7/sys/dev/usb/if_aue.c
stable/7/sys/dev/usb/if_axe.c
stable/7/sys/dev/usb/if_cdce.c
stable/7/sys/dev/usb/if_cue.c
stable/7/sys/dev/usb/if_kue.c
stable/7/sys/dev/usb/if_rue.c
stable/7/sys/dev/usb/if_rum.c
stable/7/sys/dev/usb/if_udav.c
stable/7/sys/dev/usb/if_ural.c
stable/7/sys/dev/usb/if_zyd.c
stable/7/sys/dev/usb/udbp.c
stable/7/sys/dev/vx/if_vx.c
stable/7/sys/dev/wi/if_wi.c
stable/7/sys/dev/wl/if_wl.c
stable/7/sys/dev/wpi/if_wpi.c
stable/7/sys/dev/xe/if_xe.c
stable/7/sys/i4b/capi/capi_l4if.c
stable/7/sys/i4b/driver/i4b_ing.c
stable/7/sys/i4b/driver/i4b_isppp.c
stable/7/sys/i4b/driver/i4b_trace.c
stable/7/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c
stable/7/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c
stable/7/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c
stable/7/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c
stable/7/sys/i4b/layer1/isic/i4b_bchan.c
stable/7/sys/i4b/layer1/itjc/i4b_itjc_pci.c
stable/7/sys/i4b/layer1/iwic/i4b_iwic_bchan.c
stable/7/sys/i4b/layer4/i4b_i4bdrv.c
stable/7/sys/net/if.c
stable/7/sys/net/if_ef.c
stable/7/sys/net/if_gif.c
stable/7/sys/net/if_gre.c
stable/7/sys/net/if_ppp.c
stable/7/sys/net/if_stf.c
stable/7/sys/netatalk/ddp_usrreq.c
stable/7/sys/netgraph/ng_eiface.c
stable/7/sys/netgraph/ng_fec.c
stable/7/sys/netgraph/ng_iface.c
stable/7/sys/netgraph/ng_tty.c
stable/7/sys/netinet/ip_input.c
stable/7/sys/netinet6/ip6_input.c
stable/7/sys/netipx/ipx_input.c
stable/7/sys/pci/if_rl.c
Directory Properties:
stable/7/sys/ (props changed)
stable/7/sys/cddl/contrib/opensolaris/ (props changed)
stable/7/sys/contrib/dev/acpica/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
Modified: stable/7/sys/arm/at91/if_ate.c
==============================================================================
--- stable/7/sys/arm/at91/if_ate.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/arm/at91/if_ate.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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;
Modified: stable/7/sys/arm/xscale/ixp425/if_npe.c
==============================================================================
--- stable/7/sys/arm/xscale/ixp425/if_npe.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/arm/xscale/ixp425/if_npe.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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);
Modified: stable/7/sys/contrib/dev/oltr/if_oltr.c
==============================================================================
--- stable/7/sys/contrib/dev/oltr/if_oltr.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/contrib/dev/oltr/if_oltr.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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.
Modified: stable/7/sys/dev/ae/if_ae.c
==============================================================================
--- stable/7/sys/dev/ae/if_ae.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/ae/if_ae.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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) {
Modified: stable/7/sys/dev/an/if_an.c
==============================================================================
--- stable/7/sys/dev/an/if_an.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/an/if_an.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -742,8 +742,8 @@ an_attach(struct an_softc *sc, int unit,
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));
Modified: stable/7/sys/dev/ar/if_ar.c
==============================================================================
--- stable/7/sys/dev/ar/if_ar.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/ar/if_ar.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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);
Modified: stable/7/sys/dev/arl/if_arl.c
==============================================================================
--- stable/7/sys/dev/arl/if_arl.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/arl/if_arl.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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;
Modified: stable/7/sys/dev/ath/if_ath.c
==============================================================================
--- stable/7/sys/dev/ath/if_ath.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/ath/if_ath.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -495,8 +495,8 @@ ath_attach(u_int16_t devid, struct ath_s
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;
Modified: stable/7/sys/dev/awi/awi.c
==============================================================================
--- stable/7/sys/dev/awi/awi.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/awi/awi.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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
Modified: stable/7/sys/dev/ce/if_ce.c
==============================================================================
--- stable/7/sys/dev/ce/if_ce.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/ce/if_ce.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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
Modified: stable/7/sys/dev/cm/smc90cx6.c
==============================================================================
--- stable/7/sys/dev/cm/smc90cx6.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/cm/smc90cx6.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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;
Modified: stable/7/sys/dev/cnw/if_cnw.c
==============================================================================
--- stable/7/sys/dev/cnw/if_cnw.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/cnw/if_cnw.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -1666,7 +1666,7 @@ static int cnw_pccard_attach(device_t de
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);
Modified: stable/7/sys/dev/cp/if_cp.c
==============================================================================
--- stable/7/sys/dev/cp/if_cp.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/cp/if_cp.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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,
Modified: stable/7/sys/dev/cs/if_cs.c
==============================================================================
--- stable/7/sys/dev/cs/if_cs.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/cs/if_cs.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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
*/
Modified: stable/7/sys/dev/ctau/if_ct.c
==============================================================================
--- stable/7/sys/dev/ctau/if_ct.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/ctau/if_ct.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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,
Modified: stable/7/sys/dev/cx/if_cx.c
==============================================================================
--- stable/7/sys/dev/cx/if_cx.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/cx/if_cx.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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,
Modified: stable/7/sys/dev/cxgb/cxgb_main.c
==============================================================================
--- stable/7/sys/dev/cxgb/cxgb_main.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/cxgb/cxgb_main.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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);
Modified: stable/7/sys/dev/ed/if_ed.c
==============================================================================
--- stable/7/sys/dev/ed/if_ed.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/ed/if_ed.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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;
Modified: stable/7/sys/dev/ep/if_ep.c
==============================================================================
--- stable/7/sys/dev/ep/if_ep.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/ep/if_ep.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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) {
Modified: stable/7/sys/dev/ex/if_ex.c
==============================================================================
--- stable/7/sys/dev/ex/if_ex.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/ex/if_ex.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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);
Modified: stable/7/sys/dev/ie/if_ie.c
==============================================================================
--- stable/7/sys/dev/ie/if_ie.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/ie/if_ie.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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,
Modified: stable/7/sys/dev/iicbus/if_ic.c
==============================================================================
--- stable/7/sys/dev/iicbus/if_ic.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/iicbus/if_ic.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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);
Modified: stable/7/sys/dev/ipw/if_ipw.c
==============================================================================
--- stable/7/sys/dev/ipw/if_ipw.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/ipw/if_ipw.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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;
Modified: stable/7/sys/dev/iwi/if_iwi.c
==============================================================================
--- stable/7/sys/dev/iwi/if_iwi.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/iwi/if_iwi.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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;
Modified: stable/7/sys/dev/le/lance.c
==============================================================================
--- stable/7/sys/dev/le/lance.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/le/lance.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -133,8 +133,8 @@ lance_config(struct lance_softc *sc, con
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. */
Modified: stable/7/sys/dev/malo/if_malo.c
==============================================================================
--- stable/7/sys/dev/malo/if_malo.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/malo/if_malo.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -243,8 +243,8 @@ malo_attach(uint16_t devid, struct malo_
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. */
Modified: stable/7/sys/dev/my/if_my.c
==============================================================================
--- stable/7/sys/dev/my/if_my.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/my/if_my.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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)
Modified: stable/7/sys/dev/nxge/if_nxge.c
==============================================================================
--- stable/7/sys/dev/nxge/if_nxge.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/nxge/if_nxge.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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;
Modified: stable/7/sys/dev/pdq/pdq_ifsubr.c
==============================================================================
--- stable/7/sys/dev/pdq/pdq_ifsubr.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/pdq/pdq_ifsubr.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -423,7 +423,7 @@ pdq_ifattach(pdq_softc_t *sc, const pdq_
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;
Modified: stable/7/sys/dev/ppbus/if_plip.c
==============================================================================
--- stable/7/sys/dev/ppbus/if_plip.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/ppbus/if_plip.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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));
Modified: stable/7/sys/dev/ral/rt2560.c
==============================================================================
--- stable/7/sys/dev/ral/rt2560.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/ral/rt2560.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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;
Modified: stable/7/sys/dev/ral/rt2661.c
==============================================================================
--- stable/7/sys/dev/ral/rt2661.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/ral/rt2661.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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;
Modified: stable/7/sys/dev/ray/if_ray.c
==============================================================================
--- stable/7/sys/dev/ray/if_ray.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/ray/if_ray.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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);
Modified: stable/7/sys/dev/sbni/if_sbni.c
==============================================================================
--- stable/7/sys/dev/sbni/if_sbni.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/sbni/if_sbni.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -235,7 +235,7 @@ sbni_attach(struct sbni_softc *sc, int u
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);
Modified: stable/7/sys/dev/sbsh/if_sbsh.c
==============================================================================
--- stable/7/sys/dev/sbsh/if_sbsh.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/sbsh/if_sbsh.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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);
Modified: stable/7/sys/dev/sn/if_sn.c
==============================================================================
--- stable/7/sys/dev/sn/if_sn.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/sn/if_sn.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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;
Modified: stable/7/sys/dev/snc/dp83932.c
==============================================================================
--- stable/7/sys/dev/snc/dp83932.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/snc/dp83932.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -186,7 +186,7 @@ sncconfig(sc, media, nmedia, defmedia, m
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,
Modified: stable/7/sys/dev/sr/if_sr.c
==============================================================================
--- stable/7/sys/dev/sr/if_sr.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/sr/if_sr.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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);
Modified: stable/7/sys/dev/usb/if_aue.c
==============================================================================
--- stable/7/sys/dev/usb/if_aue.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/usb/if_aue.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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);
/*
Modified: stable/7/sys/dev/usb/if_axe.c
==============================================================================
--- stable/7/sys/dev/usb/if_axe.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/usb/if_axe.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -653,8 +653,8 @@ device_printf(sc->axe_dev, "%s, bufsz %d
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,
Modified: stable/7/sys/dev/usb/if_cdce.c
==============================================================================
--- stable/7/sys/dev/usb/if_cdce.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/usb/if_cdce.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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;
Modified: stable/7/sys/dev/usb/if_cue.c
==============================================================================
--- stable/7/sys/dev/usb/if_cue.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/usb/if_cue.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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;
Modified: stable/7/sys/dev/usb/if_kue.c
==============================================================================
--- stable/7/sys/dev/usb/if_kue.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/usb/if_kue.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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;
Modified: stable/7/sys/dev/usb/if_rue.c
==============================================================================
--- stable/7/sys/dev/usb/if_rue.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/usb/if_rue.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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
Modified: stable/7/sys/dev/usb/if_rum.c
==============================================================================
--- stable/7/sys/dev/usb/if_rum.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/usb/if_rum.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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;
Modified: stable/7/sys/dev/usb/if_udav.c
==============================================================================
--- stable/7/sys/dev/usb/if_udav.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/usb/if_udav.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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);
Modified: stable/7/sys/dev/usb/if_ural.c
==============================================================================
--- stable/7/sys/dev/usb/if_ural.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/usb/if_ural.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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;
Modified: stable/7/sys/dev/usb/if_zyd.c
==============================================================================
--- stable/7/sys/dev/usb/if_zyd.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/usb/if_zyd.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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);
Modified: stable/7/sys/dev/usb/udbp.c
==============================================================================
--- stable/7/sys/dev/usb/udbp.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/usb/udbp.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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,
Modified: stable/7/sys/dev/vx/if_vx.c
==============================================================================
--- stable/7/sys/dev/vx/if_vx.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/vx/if_vx.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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;
Modified: stable/7/sys/dev/wi/if_wi.c
==============================================================================
--- stable/7/sys/dev/wi/if_wi.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/wi/if_wi.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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;
Modified: stable/7/sys/dev/wl/if_wl.c
==============================================================================
--- stable/7/sys/dev/wl/if_wl.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/wl/if_wl.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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
Modified: stable/7/sys/dev/wpi/if_wpi.c
==============================================================================
--- stable/7/sys/dev/wpi/if_wpi.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/wpi/if_wpi.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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);
Modified: stable/7/sys/dev/xe/if_xe.c
==============================================================================
--- stable/7/sys/dev/xe/if_xe.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/dev/xe/if_xe.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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);
Modified: stable/7/sys/i4b/capi/capi_l4if.c
==============================================================================
--- stable/7/sys/i4b/capi/capi_l4if.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/i4b/capi/capi_l4if.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -93,13 +93,13 @@ i4b_capi_bch_config(int unit, int chan,
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);
Modified: stable/7/sys/i4b/driver/i4b_ing.c
==============================================================================
--- stable/7/sys/i4b/driver/i4b_ing.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/i4b/driver/i4b_ing.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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))
Modified: stable/7/sys/i4b/driver/i4b_isppp.c
==============================================================================
--- stable/7/sys/i4b/driver/i4b_isppp.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/i4b/driver/i4b_isppp.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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;
Modified: stable/7/sys/i4b/driver/i4b_trace.c
==============================================================================
--- stable/7/sys/i4b/driver/i4b_trace.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/i4b/driver/i4b_trace.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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);
Modified: stable/7/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c
==============================================================================
--- stable/7/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -1137,7 +1137,7 @@ avma1pp_bchannel_setup(int unit, int h_c
/* 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_c
/* transmitter part */
- chan->tx_queue.ifq_maxlen = IFQ_MAXLEN;
+ chan->tx_queue.ifq_maxlen = ifqmaxlen;
i4b_Bcleanifq(&chan->tx_queue); /* clean tx queue */
Modified: stable/7/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c
==============================================================================
--- stable/7/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -1084,7 +1084,7 @@ avma1pp2_bchannel_setup(int unit, int h_
/* 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_
/* transmitter part */
- chan->tx_queue.ifq_maxlen = IFQ_MAXLEN;
+ chan->tx_queue.ifq_maxlen = ifqmaxlen;
i4b_Bcleanifq(&chan->tx_queue); /* clean tx queue */
Modified: stable/7/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c
==============================================================================
--- stable/7/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -1047,7 +1047,7 @@ avm_pnp_bchannel_setup(int unit, int h_c
/* 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_c
/* 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))
Modified: stable/7/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c
==============================================================================
--- stable/7/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -354,7 +354,7 @@ ihfc_init (ihfc_sc_t *sc, u_char chan, i
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, i
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))
Modified: stable/7/sys/i4b/layer1/isic/i4b_bchan.c
==============================================================================
--- stable/7/sys/i4b/layer1/isic/i4b_bchan.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/i4b/layer1/isic/i4b_bchan.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -84,7 +84,7 @@ isic_bchannel_setup(int unit, int h_chan
/* 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
/* 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);
Modified: stable/7/sys/i4b/layer1/itjc/i4b_itjc_pci.c
==============================================================================
--- stable/7/sys/i4b/layer1/itjc/i4b_itjc_pci.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/i4b/layer1/itjc/i4b_itjc_pci.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -1858,7 +1858,7 @@ itjc_bchannel_setup(int unit, int h_chan
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
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 */
Modified: stable/7/sys/i4b/layer1/iwic/i4b_iwic_bchan.c
==============================================================================
--- stable/7/sys/i4b/layer1/iwic/i4b_iwic_bchan.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/i4b/layer1/iwic/i4b_iwic_bchan.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -428,7 +428,7 @@ iwic_bchannel_setup(int unit, int chan_n
/* 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_n
/* 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))
Modified: stable/7/sys/i4b/layer4/i4b_i4bdrv.c
==============================================================================
--- stable/7/sys/i4b/layer4/i4b_i4bdrv.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/i4b/layer4/i4b_i4bdrv.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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);
Modified: stable/7/sys/net/if.c
==============================================================================
--- stable/7/sys/net/if.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/net/if.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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;
Modified: stable/7/sys/net/if_ef.c
==============================================================================
--- stable/7/sys/net/if_ef.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/net/if_ef.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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
Modified: stable/7/sys/net/if_gif.c
==============================================================================
--- stable/7/sys/net/if_gif.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/net/if_gif.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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)
Modified: stable/7/sys/net/if_gre.c
==============================================================================
--- stable/7/sys/net/if_gre.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/net/if_gre.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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;
Modified: stable/7/sys/net/if_ppp.c
==============================================================================
--- stable/7/sys/net/if_ppp.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/net/if_ppp.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -228,10 +228,10 @@ ppp_clone_create(struct if_clone *ifc, i
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);
Modified: stable/7/sys/net/if_stf.c
==============================================================================
--- stable/7/sys/net/if_stf.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/net/if_stf.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -252,7 +252,7 @@ stf_clone_create(struct if_clone *ifc, c
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);
Modified: stable/7/sys/netatalk/ddp_usrreq.c
==============================================================================
--- stable/7/sys/netatalk/ddp_usrreq.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/netatalk/ddp_usrreq.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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);
Modified: stable/7/sys/netgraph/ng_eiface.c
==============================================================================
--- stable/7/sys/netgraph/ng_eiface.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/netgraph/ng_eiface.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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
Modified: stable/7/sys/netgraph/ng_fec.c
==============================================================================
--- stable/7/sys/netgraph/ng_fec.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/netgraph/ng_fec.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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 */
Modified: stable/7/sys/netgraph/ng_iface.c
==============================================================================
--- stable/7/sys/netgraph/ng_iface.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/netgraph/ng_iface.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -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) */
Modified: stable/7/sys/netgraph/ng_tty.c
==============================================================================
--- stable/7/sys/netgraph/ng_tty.c Tue Nov 16 03:43:06 2010 (r215367)
+++ stable/7/sys/netgraph/ng_tty.c Tue Nov 16 04:40:03 2010 (r215368)
@@ -202,7 +202,7 @@ ngt_open(struct cdev *dev, struct tty *t
sc->tp = tp;
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-stable-7
mailing list