From 1a89f467197b52dbc105d9fb9b7aef6a030434a1 Mon Sep 17 00:00:00 2001
From: Henning Brauer <henning@cvs.openbsd.org>
Date: Wed, 6 Jul 2011 02:42:29 +0000
Subject: cosnistently use IFQ_SET_MAXLEN, surfaced in a discussion with + ok
 bluhm

---
 sys/dev/pci/if_de.c         |  4 ++--
 sys/dev/pci/if_lmc_common.c |  4 ++--
 sys/net/if.c                |  4 ++--
 sys/net/if_pflog.c          |  4 ++--
 sys/net/if_pflow.c          |  4 ++--
 sys/net/if_pfsync.c         |  4 ++--
 sys/net/if_ppp.c            |  8 ++++----
 sys/net/if_pppoe.c          |  6 +++---
 sys/net/if_sl.c             |  4 ++--
 sys/net/if_spppsubr.c       |  7 +++----
 sys/netatalk/ddp_usrreq.c   |  6 +++---
 sys/netbt/hci_unit.c        | 12 ++++++------
 sys/netinet/if_ether.c      |  4 ++--
 sys/netinet/ip_input.c      |  4 ++--
 sys/netinet6/ip6_input.c    |  4 ++--
 sys/netmpls/mpls_input.c    |  4 ++--
 sys/netnatm/natm_proto.c    |  4 ++--
 17 files changed, 43 insertions(+), 44 deletions(-)

(limited to 'sys')

diff --git a/sys/dev/pci/if_de.c b/sys/dev/pci/if_de.c
index 961cfcacdb8..fa2f274d47d 100644
--- a/sys/dev/pci/if_de.c
+++ b/sys/dev/pci/if_de.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_de.c,v 1.107 2011/04/03 15:36:02 jasper Exp $	*/
+/*	$OpenBSD: if_de.c,v 1.108 2011/07/06 02:42:27 henning Exp $	*/
 /*	$NetBSD: if_de.c,v 1.58 1998/01/12 09:39:58 thorpej Exp $	*/
 
 /*-
@@ -3061,7 +3061,7 @@ tulip_reset(tulip_softc_t * const sc)
 		      TULIP_BUSMODE_DESC_BIGENDIAN : 0));
 
     sc->tulip_txtimer = 0;
-    sc->tulip_txq.ifq_maxlen = TULIP_TXDESCS;
+    IFQ_SET_MAXLEN(&sc->tulip_txq, TULIP_TXDESCS);
     /*
      * Free all the mbufs that were on the transmit ring.
      */
diff --git a/sys/dev/pci/if_lmc_common.c b/sys/dev/pci/if_lmc_common.c
index a7ac9c465f0..5168def4b9d 100644
--- a/sys/dev/pci/if_lmc_common.c
+++ b/sys/dev/pci/if_lmc_common.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_lmc_common.c,v 1.12 2010/04/08 00:23:53 tedu Exp $ */
+/*	$OpenBSD: if_lmc_common.c,v 1.13 2011/07/06 02:42:28 henning Exp $ */
 /*	$NetBSD: if_lmc_common.c,v 1.1 1999/03/25 03:32:43 explorer Exp $	*/
 
 /*-
@@ -261,7 +261,7 @@ lmc_dec_reset(lmc_softc_t * const sc)
 		|TULIP_BUSMODE_CACHE_ALIGN8
 		|TULIP_BUSMODE_READMULTIPLE);
 
-	sc->lmc_txq.ifq_maxlen = LMC_TXDESCS;
+	IFQ_SET_MAXLEN(&sc->lmc_txq, LMC_TXDESCS);
 
 	/*
 	 * Free all the mbufs that were on the transmit ring.
diff --git a/sys/net/if.c b/sys/net/if.c
index 6c3b90020a1..edf45b23e00 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if.c,v 1.236 2011/07/05 00:58:27 henning Exp $	*/
+/*	$OpenBSD: if.c,v 1.237 2011/07/06 02:42:28 henning Exp $	*/
 /*	$NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $	*/
 
 /*
@@ -279,7 +279,7 @@ if_attachsetup(struct ifnet *ifp)
 	ifindex2ifnet[if_index] = ifp;
 
 	if (ifp->if_snd.ifq_maxlen == 0)
-		ifp->if_snd.ifq_maxlen = ifqmaxlen;
+		IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen);
 #ifdef ALTQ
 	ifp->if_snd.altq_type = 0;
 	ifp->if_snd.altq_disc = NULL;
diff --git a/sys/net/if_pflog.c b/sys/net/if_pflog.c
index bcc4790da4f..d1b87013227 100644
--- a/sys/net/if_pflog.c
+++ b/sys/net/if_pflog.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_pflog.c,v 1.36 2011/07/05 22:28:44 bluhm Exp $	*/
+/*	$OpenBSD: if_pflog.c,v 1.37 2011/07/06 02:42:28 henning Exp $	*/
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr) and 
@@ -128,7 +128,7 @@ pflog_clone_create(struct if_clone *ifc, int unit)
 	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);
 	if_alloc_sadl(ifp);
diff --git a/sys/net/if_pflow.c b/sys/net/if_pflow.c
index 2b506ad0a97..604816ef1d3 100644
--- a/sys/net/if_pflow.c
+++ b/sys/net/if_pflow.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_pflow.c,v 1.15 2011/04/05 18:01:21 henning Exp $	*/
+/*	$OpenBSD: if_pflow.c,v 1.16 2011/07/06 02:42:28 henning Exp $	*/
 
 /*
  * Copyright (c) 2008 Henning Brauer <henning@openbsd.org>
@@ -132,7 +132,7 @@ pflow_clone_create(struct if_clone *ifc, int unit)
 	ifp->if_output = pflowoutput;
 	ifp->if_start = pflowstart;
 	ifp->if_type = IFT_PFLOW;
-	ifp->if_snd.ifq_maxlen = ifqmaxlen;
+	IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen);
 	ifp->if_hdrlen = PFLOW_HDRLEN;
 	ifp->if_flags = IFF_UP;
 	ifp->if_flags &= ~IFF_RUNNING;	/* not running, need receiver */
diff --git a/sys/net/if_pfsync.c b/sys/net/if_pfsync.c
index 2adc8f47206..4b45a22c364 100644
--- a/sys/net/if_pfsync.c
+++ b/sys/net/if_pfsync.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_pfsync.c,v 1.164 2011/07/04 20:40:58 dhill Exp $	*/
+/*	$OpenBSD: if_pfsync.c,v 1.165 2011/07/06 02:42:28 henning Exp $	*/
 
 /*
  * Copyright (c) 2002 Michael Shalayeff
@@ -317,7 +317,7 @@ pfsync_clone_create(struct if_clone *ifc, int unit)
 	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 = sizeof(struct pfsync_header);
 	ifp->if_mtu = 1500; /* XXX */
 	ifp->if_hardmtu = MCLBYTES; /* XXX */
diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c
index 3f94efe822d..c2888bb34c4 100644
--- a/sys/net/if_ppp.c
+++ b/sys/net/if_ppp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ppp.c,v 1.60 2011/07/05 19:59:18 henning Exp $	*/
+/*	$OpenBSD: if_ppp.c,v 1.61 2011/07/06 02:42:28 henning Exp $	*/
 /*	$NetBSD: if_ppp.c,v 1.39 1997/05/17 21:11:59 christos Exp $	*/
 
 /*
@@ -251,9 +251,9 @@ ppp_clone_create(ifc, unit)
     sc->sc_if.if_start = ppp_ifstart;
 #endif
     IFQ_SET_MAXLEN(&sc->sc_if.if_snd, ifqmaxlen);
-    sc->sc_inq.ifq_maxlen = ifqmaxlen;
-    sc->sc_fastq.ifq_maxlen = ifqmaxlen;
-    sc->sc_rawq.ifq_maxlen = ifqmaxlen;
+    IFQ_SET_MAXLEN(&sc->sc_inq, ifqmaxlen);
+    IFQ_SET_MAXLEN(&sc->sc_fastq, ifqmaxlen);
+    IFQ_SET_MAXLEN(&sc->sc_rawq, ifqmaxlen);
     IFQ_SET_READY(&sc->sc_if.if_snd);
     if_attach(&sc->sc_if);
     if_alloc_sadl(&sc->sc_if);
diff --git a/sys/net/if_pppoe.c b/sys/net/if_pppoe.c
index e386495c435..a84c0682c7f 100644
--- a/sys/net/if_pppoe.c
+++ b/sys/net/if_pppoe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_pppoe.c,v 1.32 2011/07/05 20:00:14 henning Exp $ */
+/* $OpenBSD: if_pppoe.c,v 1.33 2011/07/06 02:42:28 henning Exp $ */
 /* $NetBSD: if_pppoe.c,v 1.51 2003/11/28 08:56:48 keihan Exp $ */
 
 /*
@@ -205,8 +205,8 @@ pppoeattach(int count)
 	LIST_INIT(&pppoe_softc_list);
 	if_clone_attach(&pppoe_cloner);
 
-	pppoediscinq.ifq_maxlen = IFQ_MAXLEN;
-	pppoeinq.ifq_maxlen = IFQ_MAXLEN;
+	IFQ_SET_MAXLEN(&pppoediscinq, IFQ_MAXLEN);
+	IFQ_SET_MAXLEN(&pppoeinq, IFQ_MAXLEN);
 }
 
 /* Create a new interface. */
diff --git a/sys/net/if_sl.c b/sys/net/if_sl.c
index 1b6a63899e8..7b481188cb2 100644
--- a/sys/net/if_sl.c
+++ b/sys/net/if_sl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_sl.c,v 1.43 2011/01/06 11:52:41 claudio Exp $	*/
+/*	$OpenBSD: if_sl.c,v 1.44 2011/07/06 02:42:28 henning Exp $	*/
 /*	$NetBSD: if_sl.c,v 1.39.4.1 1996/06/02 16:26:31 thorpej Exp $	*/
 
 /*
@@ -221,7 +221,7 @@ sl_clone_create(ifc, unit)
 	sc->sc_if.if_ioctl = slioctl;
 	sc->sc_if.if_output = sloutput;
 	IFQ_SET_MAXLEN(&sc->sc_if.if_snd, 50);
-	sc->sc_fastq.ifq_maxlen = 32;
+	IFQ_SET_MAXLEN(&sc->sc_fastq, 32);
 	IFQ_SET_READY(&sc->sc_if.if_snd);
 	if_attach(&sc->sc_if);
 	if_alloc_sadl(&sc->sc_if);
diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c
index 57cb5c8c45c..837c0ada7d0 100644
--- a/sys/net/if_spppsubr.c
+++ b/sys/net/if_spppsubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_spppsubr.c,v 1.90 2011/07/05 21:11:36 guenther Exp $	*/
+/*	$OpenBSD: if_spppsubr.c,v 1.91 2011/07/06 02:42:28 henning Exp $	*/
 /*
  * Synchronous PPP/Cisco link level subroutines.
  * Keepalive protocol implemented in both Cisco and PPP modes.
@@ -933,8 +933,8 @@ sppp_attach(struct ifnet *ifp)
 	sp->pp_if.if_type = IFT_PPP;
 	sp->pp_if.if_output = sppp_output;
 	IFQ_SET_MAXLEN(&sp->pp_if.if_snd, 50);
-	sp->pp_fastq.ifq_maxlen = 50;
-	sp->pp_cpq.ifq_maxlen = 50;
+	IFQ_SET_MAXLEN(&sp->pp_fastq, 50);
+	IFQ_SET_MAXLEN(&sp->pp_cpq, 50);
 	sp->pp_loopcnt = 0;
 	sp->pp_alivecnt = 0;
 	sp->pp_last_activity = 0;
@@ -945,7 +945,6 @@ sppp_attach(struct ifnet *ifp)
 	sp->pp_up = lcp.Up;
 	sp->pp_down = lcp.Down;
 
-
 	for (i = 0; i < IDX_COUNT; i++)
 		timeout_set(&sp->ch[i], (cps[i])->TO, (void *)sp);
 	timeout_set(&sp->pap_my_to_ch, sppp_pap_my_TO, (void *)sp);
diff --git a/sys/netatalk/ddp_usrreq.c b/sys/netatalk/ddp_usrreq.c
index de38f392eb0..f63951d66c9 100644
--- a/sys/netatalk/ddp_usrreq.c
+++ b/sys/netatalk/ddp_usrreq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ddp_usrreq.c,v 1.14 2010/06/30 20:37:54 claudio Exp $	*/
+/*	$OpenBSD: ddp_usrreq.c,v 1.15 2011/07/06 02:42:28 henning Exp $	*/
 
 /*
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
@@ -583,8 +583,8 @@ ddp_search( from, to, aa )
 void
 ddp_init()
 {
-    atintrq1.ifq_maxlen = IFQ_MAXLEN;
-    atintrq2.ifq_maxlen = IFQ_MAXLEN;
+	IFQ_SET_MAXLEN(&atintrq1, IFQ_MAXLEN);
+	IFQ_SET_MAXLEN(&atintrq2, IFQ_MAXLEN);
 }
 
 /*
diff --git a/sys/netbt/hci_unit.c b/sys/netbt/hci_unit.c
index 7a04936fbf8..8a08dfcc2e5 100644
--- a/sys/netbt/hci_unit.c
+++ b/sys/netbt/hci_unit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hci_unit.c,v 1.11 2010/07/02 02:40:16 blambert Exp $	*/
+/*	$OpenBSD: hci_unit.c,v 1.12 2011/07/06 02:42:28 henning Exp $	*/
 /*	$NetBSD: hci_unit.c,v 1.12 2008/06/26 14:17:27 plunky Exp $	*/
 
 /*-
@@ -100,11 +100,11 @@ hci_attach(const struct hci_if *hci_if, struct device *dev, uint16_t flags)
 	mtx_init(&unit->hci_devlock, hci_if->ipl);
 	unit->hci_init = 0;	/* kcondvar_t in NetBSD */
 
-	unit->hci_eventq.ifq_maxlen = hci_eventq_max;
-	unit->hci_aclrxq.ifq_maxlen = hci_aclrxq_max;
-	unit->hci_scorxq.ifq_maxlen = hci_scorxq_max;
-	unit->hci_cmdwait.ifq_maxlen = hci_cmdwait_max;
-	unit->hci_scodone.ifq_maxlen = hci_scodone_max;
+	IFQ_SET_MAXLEN(&unit->hci_eventq, hci_eventq_max);
+	IFQ_SET_MAXLEN(&unit->hci_aclrxq, hci_aclrxq_max);
+	IFQ_SET_MAXLEN(&unit->hci_scorxq, hci_scorxq_max);
+	IFQ_SET_MAXLEN(&unit->hci_cmdwait, hci_cmdwait_max);
+	IFQ_SET_MAXLEN(&unit->hci_scodone, hci_scodone_max);
 
 	TAILQ_INIT(&unit->hci_links);
 	LIST_INIT(&unit->hci_memos);
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c
index 87cc6ada8e9..0991cb507ca 100644
--- a/sys/netinet/if_ether.c
+++ b/sys/netinet/if_ether.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ether.c,v 1.91 2011/07/05 23:15:15 henning Exp $	*/
+/*	$OpenBSD: if_ether.c,v 1.92 2011/07/06 02:42:28 henning Exp $	*/
 /*	$NetBSD: if_ether.c,v 1.31 1996/05/11 12:59:58 mycroft Exp $	*/
 
 /*
@@ -149,7 +149,7 @@ arp_rtrequest(int req, struct rtentry *rt, struct rt_addrinfo *info)
 		static struct timeout arptimer_to;
 
 		arpinit_done = 1;
-		arpintrq.ifq_maxlen = 50;	/* XXX hate magic numbers */
+		IFQ_SET_MAXLEN(&arpintrq, 50);	/* XXX hate magic numbers */
 		/*
 		 * We generate expiration times from time.tv_sec
 		 * so avoid accidently creating permanent routes.
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index a547218065d..7fa3d66f7f0 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_input.c,v 1.194 2011/07/05 21:40:38 dhill Exp $	*/
+/*	$OpenBSD: ip_input.c,v 1.195 2011/07/06 02:42:28 henning Exp $	*/
 /*	$NetBSD: ip_input.c,v 1.30 1996/03/16 23:53:58 christos Exp $	*/
 
 /*
@@ -206,7 +206,7 @@ ip_init(void)
 		    pr->pr_protocol < IPPROTO_MAX)
 			ip_protox[pr->pr_protocol] = pr - inetsw;
 	LIST_INIT(&ipq);
-	ipintrq.ifq_maxlen = ipqmaxlen;
+	IFQ_SET_MAXLEN(&ipintrq, ipqmaxlen);
 	TAILQ_INIT(&in_ifaddr);
 	if (ip_mtudisc != 0)
 		ip_mtudisc_timeout_q =
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c
index f7ea8494b10..a256c0aadc9 100644
--- a/sys/netinet6/ip6_input.c
+++ b/sys/netinet6/ip6_input.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip6_input.c,v 1.100 2011/07/04 06:54:49 claudio Exp $	*/
+/*	$OpenBSD: ip6_input.c,v 1.101 2011/07/06 02:42:28 henning Exp $	*/
 /*	$KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $	*/
 
 /*
@@ -155,7 +155,7 @@ ip6_init(void)
 		    pr->pr_protocol && pr->pr_protocol != IPPROTO_RAW &&
 		    pr->pr_protocol < IPPROTO_MAX)
 			ip6_protox[pr->pr_protocol] = pr - inet6sw;
-	ip6intrq.ifq_maxlen = ip6qmaxlen;
+	IFQ_SET_MAXLEN(&ip6intrq, ip6qmaxlen);
 	ip6_randomid_init();
 	nd6_init();
 	frag6_init();
diff --git a/sys/netmpls/mpls_input.c b/sys/netmpls/mpls_input.c
index 27b368d2cbb..a08abbb2a1a 100644
--- a/sys/netmpls/mpls_input.c
+++ b/sys/netmpls/mpls_input.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpls_input.c,v 1.31 2011/01/21 17:42:57 mikeb Exp $	*/
+/*	$OpenBSD: mpls_input.c,v 1.32 2011/07/06 02:42:28 henning Exp $	*/
 
 /*
  * Copyright (c) 2008 Claudio Jeker <claudio@openbsd.org>
@@ -65,7 +65,7 @@ struct mbuf	*mpls_do_error(struct mbuf *, int, int, int);
 void
 mpls_init(void)
 {
-	mplsintrq.ifq_maxlen = mplsqmaxlen;
+	IFQ_SET_MAXLEN(&mplsintrq, mplsqmaxlen);
 }
 
 void
diff --git a/sys/netnatm/natm_proto.c b/sys/netnatm/natm_proto.c
index 1f55905b61b..13e23993a3f 100644
--- a/sys/netnatm/natm_proto.c
+++ b/sys/netnatm/natm_proto.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: natm_proto.c,v 1.5 2011/03/31 10:36:42 jasper Exp $	*/
+/*	$OpenBSD: natm_proto.c,v 1.6 2011/07/06 02:42:28 henning Exp $	*/
 
 /*
  *
@@ -105,7 +105,7 @@ void natm_init()
 {
   LIST_INIT(&natm_pcbs);
   bzero(&natmintrq, sizeof(natmintrq));
-  natmintrq.ifq_maxlen = natmqmaxlen;
+  IFQ_SET_MAXLEN(&natmintrq, natmqmaxlen);
 }
 
 #if defined(__FreeBSD__)
-- 
cgit v1.2.3