From ef9870ec81fbb08724724f7ca610d50b071a6bb1 Mon Sep 17 00:00:00 2001 From: Sepherosa Ziehau Date: Thu, 27 Dec 2012 17:39:50 +0800 Subject: [PATCH] ifq: Use ifq_set_maxlen for ifnet.if_snd --- sys/dev/netif/de/if_de.c | 2 +- sys/dev/netif/ixgbe/ixgbe.c | 2 +- sys/net/disc/if_disc.c | 3 ++- sys/net/ef/if_ef.c | 3 ++- sys/net/faith/if_faith.c | 3 ++- sys/net/gif/if_gif.c | 3 ++- sys/net/gre/if_gre.c | 3 ++- sys/net/if.c | 2 +- sys/net/pf/if_pflog.c | 3 ++- sys/net/pf/if_pfsync.c | 3 ++- sys/net/sppp/if_spppsubr.c | 2 +- sys/net/stf/if_stf.c | 3 ++- sys/netgraph/eiface/ng_eiface.c | 3 ++- sys/netgraph/fec/ng_fec.c | 2 +- sys/netgraph/iface/ng_iface.c | 3 ++- sys/netgraph7/iface/ng_iface.c | 1 - sys/netgraph7/ng_eiface.c | 2 +- sys/netgraph7/ng_fec.c | 2 +- sys/netgraph7/ng_source.c | 2 +- sys/netproto/atm/atm_if.c | 2 +- 20 files changed, 29 insertions(+), 20 deletions(-) diff --git a/sys/dev/netif/de/if_de.c b/sys/dev/netif/de/if_de.c index 8e8b082134..7700bd7a02 100644 --- a/sys/dev/netif/de/if_de.c +++ b/sys/dev/netif/de/if_de.c @@ -3887,8 +3887,8 @@ tulip_attach(tulip_softc_t *sc) tulip_reset(sc); + ifq_set_maxlen(&ifp->if_snd, ifqmaxlen); ether_ifattach(&(sc)->tulip_if, sc->tulip_enaddr, NULL); - ifp->if_snd.ifq_maxlen = ifqmaxlen; } static void diff --git a/sys/dev/netif/ixgbe/ixgbe.c b/sys/dev/netif/ixgbe/ixgbe.c index 371f69b972..274affda39 100644 --- a/sys/dev/netif/ixgbe/ixgbe.c +++ b/sys/dev/netif/ixgbe/ixgbe.c @@ -2415,7 +2415,7 @@ ixgbe_setup_interface(device_t dev, struct adapter *adapter) ifp->if_transmit = ixgbe_mq_start; ifp->if_qflush = ixgbe_qflush; #endif - ifp->if_snd.ifq_maxlen = adapter->num_tx_desc - 2; + ifq_set_maxlen(&ifp->if_snd, adapter->num_tx_desc - 2); ether_ifattach(ifp, adapter->hw.mac.addr, NULL); diff --git a/sys/net/disc/if_disc.c b/sys/net/disc/if_disc.c index 4f5cbb4354..0fa42ac7ec 100644 --- a/sys/net/disc/if_disc.c +++ b/sys/net/disc/if_disc.c @@ -49,6 +49,7 @@ #include #include +#include #include #include @@ -83,7 +84,7 @@ discattach(void) ifp->if_type = IFT_LOOP; ifp->if_hdrlen = 0; ifp->if_addrlen = 0; - ifp->if_snd.ifq_maxlen = 20; + ifq_set_maxlen(&ifp->if_snd, 20); if_attach(ifp, NULL); bpfattach(ifp, DLT_NULL, sizeof(u_int)); } diff --git a/sys/net/ef/if_ef.c b/sys/net/ef/if_ef.c index 463503f502..1e2bc07164 100644 --- a/sys/net/ef/if_ef.c +++ b/sys/net/ef/if_ef.c @@ -47,6 +47,7 @@ #include #include #include +#include #include #include #include @@ -132,7 +133,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; + ifq_set_maxlen(&ifp->if_snd, IFQ_MAXLEN); ifp->if_flags = (IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST); /* * Attach the interface diff --git a/sys/net/faith/if_faith.c b/sys/net/faith/if_faith.c index b1a1dc71af..29813e2542 100644 --- a/sys/net/faith/if_faith.c +++ b/sys/net/faith/if_faith.c @@ -64,6 +64,7 @@ #include #include +#include #include #include #include @@ -172,7 +173,7 @@ faith_clone_create(struct if_clone *ifc, int unit, caddr_t param __unused) sc->sc_if.if_type = IFT_FAITH; sc->sc_if.if_hdrlen = 0; sc->sc_if.if_addrlen = 0; - sc->sc_if.if_snd.ifq_maxlen = ifqmaxlen; + ifq_set_maxlen(&sc->sc_if.if_snd, ifqmaxlen); if_attach(&sc->sc_if, NULL); bpfattach(&sc->sc_if, DLT_NULL, sizeof(u_int)); LIST_INSERT_HEAD(&faith_softc_list, sc, sc_list); diff --git a/sys/net/gif/if_gif.c b/sys/net/gif/if_gif.c index d4849b8b18..636c27bfac 100644 --- a/sys/net/gif/if_gif.c +++ b/sys/net/gif/if_gif.c @@ -54,6 +54,7 @@ #include #include +#include #include #include #include @@ -161,7 +162,7 @@ gifattach0(struct gif_softc *sc) sc->gif_if.if_ioctl = gif_ioctl; sc->gif_if.if_output = gif_output; sc->gif_if.if_type = IFT_GIF; - sc->gif_if.if_snd.ifq_maxlen = IFQ_MAXLEN; + ifq_set_maxlen(&sc->gif_if.if_snd, IFQ_MAXLEN); if_attach(&sc->gif_if, NULL); bpfattach(&sc->gif_if, DLT_NULL, sizeof(u_int)); } diff --git a/sys/net/gre/if_gre.c b/sys/net/gre/if_gre.c index a908db68ef..90f7ff3cea 100644 --- a/sys/net/gre/if_gre.c +++ b/sys/net/gre/if_gre.c @@ -65,6 +65,7 @@ #include #include #include +#include #include #include @@ -186,7 +187,7 @@ gre_clone_create(struct if_clone *ifc, int unit, caddr_t param __unused) sc->sc_if.if_softc = sc; if_initname(&(sc->sc_if), GRENAME, unit); - sc->sc_if.if_snd.ifq_maxlen = IFQ_MAXLEN; + ifq_set_maxlen(&sc->sc_if.if_snd, IFQ_MAXLEN); sc->sc_if.if_type = IFT_OTHER; sc->sc_if.if_addrlen = 0; sc->sc_if.if_hdrlen = 24; /* IP + GRE */ diff --git a/sys/net/if.c b/sys/net/if.c index a674c54289..0e57a88050 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -205,7 +205,7 @@ ifinit(void *dummy) TAILQ_FOREACH(ifp, &ifnet, if_link) { if (ifp->if_snd.ifq_maxlen == 0) { if_printf(ifp, "XXX: driver didn't set ifq_maxlen\n"); - ifp->if_snd.ifq_maxlen = ifqmaxlen; + ifq_set_maxlen(&ifp->if_snd, ifqmaxlen); } } crit_exit(); diff --git a/sys/net/pf/if_pflog.c b/sys/net/pf/if_pflog.c index fd49342221..64c1022cbb 100644 --- a/sys/net/pf/if_pflog.c +++ b/sys/net/pf/if_pflog.c @@ -52,6 +52,7 @@ #include #include +#include #include #include @@ -136,7 +137,7 @@ pflog_clone_create(struct if_clone *ifc, int unit, caddr_t param __unused) ifp->if_output = pflogoutput; ifp->if_start = pflogstart; ifp->if_type = IFT_PFLOG; - ifp->if_snd.ifq_maxlen = ifqmaxlen; + ifq_set_maxlen(&ifp->if_snd, ifqmaxlen); ifp->if_hdrlen = PFLOG_HDRLEN; if_attach(ifp, NULL); diff --git a/sys/net/pf/if_pfsync.c b/sys/net/pf/if_pfsync.c index bf73c4bd47..8781b60bc5 100644 --- a/sys/net/pf/if_pfsync.c +++ b/sys/net/pf/if_pfsync.c @@ -48,6 +48,7 @@ #include #include +#include #include #include #include @@ -150,7 +151,7 @@ pfsync_clone_create(struct if_clone *ifc, int unit, caddr_t param __unused) ifp->if_output = pfsyncoutput; ifp->if_start = pfsyncstart; ifp->if_type = IFT_PFSYNC; - ifp->if_snd.ifq_maxlen = ifqmaxlen; + ifq_set_maxlen(&ifp->if_snd, ifqmaxlen); ifp->if_hdrlen = PFSYNC_HDRLEN; ifp->if_baudrate = IF_Mbps(100); ifp->if_softc = sc; diff --git a/sys/net/sppp/if_spppsubr.c b/sys/net/sppp/if_spppsubr.c index 1b9bcd612a..d8d847b1a7 100644 --- a/sys/net/sppp/if_spppsubr.c +++ b/sys/net/sppp/if_spppsubr.c @@ -1006,7 +1006,7 @@ sppp_attach(struct ifnet *ifp) #if 0 sp->pp_flags = PP_KEEPALIVE; #endif - sp->pp_if.if_snd.ifq_maxlen = 32; + ifq_set_maxlen(&sp->pp_if.if_snd, 32); sp->pp_fastq.ifq_maxlen = 32; sp->pp_cpq.ifq_maxlen = 20; sp->pp_loopcnt = 0; diff --git a/sys/net/stf/if_stf.c b/sys/net/stf/if_stf.c index b9316cc634..7a8256ffab 100644 --- a/sys/net/stf/if_stf.c +++ b/sys/net/stf/if_stf.c @@ -94,6 +94,7 @@ #include #include #include +#include #include "if_stf.h" #include @@ -194,7 +195,7 @@ stfmodevent(module_t mod, int type, void *data) /* turn off ingress filter */ sc->sc_if.if_flags |= IFF_LINK2; #endif - sc->sc_if.if_snd.ifq_maxlen = IFQ_MAXLEN; + ifq_set_maxlen(&sc->sc_if.if_snd, IFQ_MAXLEN); if_attach(&sc->sc_if, NULL); bpfattach(&sc->sc_if, DLT_NULL, sizeof(u_int)); break; diff --git a/sys/netgraph/eiface/ng_eiface.c b/sys/netgraph/eiface/ng_eiface.c index 8628d4a149..a9dd4fba6c 100644 --- a/sys/netgraph/eiface/ng_eiface.c +++ b/sys/netgraph/eiface/ng_eiface.c @@ -45,6 +45,7 @@ #include #include +#include #include @@ -340,7 +341,7 @@ ng_eiface_constructor(node_p *nodep) ifp->if_start = ng_eiface_start; ifp->if_ioctl = ng_eiface_ioctl; ifp->if_watchdog = NULL; - ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; + ifq_set_maxlen(&ifp->if_snd, IFQ_MAXLEN); ifp->if_flags = (IFF_SIMPLEX | IFF_BROADCAST | IFF_MULTICAST); /* Give this node name * diff --git a/sys/netgraph/fec/ng_fec.c b/sys/netgraph/fec/ng_fec.c index 97ccd7133d..ea8e387852 100644 --- a/sys/netgraph/fec/ng_fec.c +++ b/sys/netgraph/fec/ng_fec.c @@ -1098,7 +1098,7 @@ ng_fec_constructor(node_p *nodep) ifp->if_ioctl = ng_fec_ioctl; ifp->if_init = ng_fec_init; ifp->if_watchdog = NULL; - ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; + ifq_set_maxlen(ifp->if_snd, IFQ_MAXLEN); ifp->if_mtu = NG_FEC_MTU_DEFAULT; ifp->if_flags = (IFF_SIMPLEX|IFF_BROADCAST|IFF_MULTICAST); ifp->if_type = IFT_PROPVIRTUAL; /* XXX */ diff --git a/sys/netgraph/iface/ng_iface.c b/sys/netgraph/iface/ng_iface.c index 61435d0c35..fb04bd3ba0 100644 --- a/sys/netgraph/iface/ng_iface.c +++ b/sys/netgraph/iface/ng_iface.c @@ -70,6 +70,7 @@ #include #include +#include #include #include @@ -587,7 +588,7 @@ ng_iface_constructor(node_p *nodep) ifp->if_start = ng_iface_start; ifp->if_ioctl = ng_iface_ioctl; ifp->if_watchdog = NULL; - ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; + ifq_set_maxlen(&ifp->if_snd, IFQ_MAXLEN); ifp->if_mtu = NG_IFACE_MTU_DEFAULT; ifp->if_flags = (IFF_SIMPLEX|IFF_POINTOPOINT|IFF_NOARP|IFF_MULTICAST); ifp->if_type = IFT_PROPVIRTUAL; /* XXX */ diff --git a/sys/netgraph7/iface/ng_iface.c b/sys/netgraph7/iface/ng_iface.c index 6cc5383e0c..7c56ddb177 100644 --- a/sys/netgraph7/iface/ng_iface.c +++ b/sys/netgraph7/iface/ng_iface.c @@ -616,7 +616,6 @@ ng_iface_constructor(node_p node) ifp->if_hdrlen = 0; /* XXX */ ifp->if_baudrate = 64000; /* XXX */ ifq_set_maxlen(&ifp->if_snd, IFQ_MAXLEN); - ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; ifq_set_ready(&ifp->if_snd); /* Give this node the same name as the interface (if possible) */ diff --git a/sys/netgraph7/ng_eiface.c b/sys/netgraph7/ng_eiface.c index 6c9289d809..1484e83701 100644 --- a/sys/netgraph7/ng_eiface.c +++ b/sys/netgraph7/ng_eiface.c @@ -366,7 +366,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; + ifq_set_maxlen(&ifp->if_snd, IFQ_MAXLEN); ifp->if_flags = (IFF_SIMPLEX | IFF_BROADCAST | IFF_MULTICAST); #if 0 diff --git a/sys/netgraph7/ng_fec.c b/sys/netgraph7/ng_fec.c index e3acef3313..108df0a3a3 100644 --- a/sys/netgraph7/ng_fec.c +++ b/sys/netgraph7/ng_fec.c @@ -1229,7 +1229,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; + ifq_set_maxlen(&ifp->if_snd, IFQ_MAXLEN); 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/netgraph7/ng_source.c b/sys/netgraph7/ng_source.c index 4a32cb2575..142f44d28c 100644 --- a/sys/netgraph7/ng_source.c +++ b/sys/netgraph7/ng_source.c @@ -629,7 +629,7 @@ ng_source_store_output_ifp(sc_p sc, char *ifname) if (ifp->if_snd.ifq_maxlen < NG_SOURCE_DRIVER_IFQ_MAXLEN) { printf("ng_source: changing ifq_maxlen from %d to %d\n", ifp->if_snd.ifq_maxlen, NG_SOURCE_DRIVER_IFQ_MAXLEN); - ifp->if_snd.ifq_maxlen = NG_SOURCE_DRIVER_IFQ_MAXLEN; + ifq_set_maxlen(&ifp->if_snd, NG_SOURCE_DRIVER_IFQ_MAXLEN); } splx(s); #endif diff --git a/sys/netproto/atm/atm_if.c b/sys/netproto/atm/atm_if.c index 9a4f7676b0..6804716352 100644 --- a/sys/netproto/atm/atm_if.c +++ b/sys/netproto/atm/atm_if.c @@ -479,7 +479,7 @@ atm_physif_ioctl(int code, caddr_t data, caddr_t arg) ifp->if_flags = IFF_UP | IFF_BROADCAST | IFF_RUNNING; ifp->if_output = atm_ifoutput; ifp->if_ioctl = atm_if_ioctl; - ifp->if_snd.ifq_maxlen = ifqmaxlen; + ifq_set_maxlen(&ifp->if_snd, ifqmaxlen); /* * Set if_type and if_baudrate */ -- 2.41.0