Don't set up ifq_maxlen manually for drivers that uses IFQ_MAXLEN

(or ifqmaxlen); it's done in if_attach() now.
No future drivers needs to set up this anymore unless they want to
use something else.

13 files changed, 14 insertions, 48 deletions

diff --git a/sys/dev/ic/an.c b/sys/dev/ic/an.c
index 7a10311b013..eaf938f0ee5 100644
--- a/sys/dev/ic/an.c
+++ b/sys/dev/ic/an.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: an.c,v 1.18 2001/06/25 21:11:16 mickey Exp $	*/
+/*	$OpenBSD: an.c,v 1.19 2001/07/08 23:38:05 fgsch Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -237,7 +237,6 @@ an_attach(sc)
 	ifp->if_start = an_start;
 	ifp->if_watchdog = an_watchdog;
 	ifp->if_baudrate = 10000000;
-	ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
 
 	bzero(sc->an_config.an_nodename, sizeof(sc->an_config.an_nodename));
 	bcopy(AN_DEFAULT_NODENAME, sc->an_config.an_nodename,
diff --git a/sys/dev/ic/dp8390.c b/sys/dev/ic/dp8390.c
index 24e3feaff70..d181cce7451 100644
--- a/sys/dev/ic/dp8390.c
+++ b/sys/dev/ic/dp8390.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dp8390.c,v 1.15 2001/06/27 06:34:41 kjc Exp $	*/
+/*	$OpenBSD: dp8390.c,v 1.16 2001/07/08 23:38:05 fgsch Exp $	*/
 /*	$NetBSD: dp8390.c,v 1.13 1998/07/05 06:49:11 jonathan Exp $	*/
 
 /*
@@ -130,7 +130,6 @@ dp8390_config(sc)
 		ifp->if_watchdog = dp8390_watchdog;
 	ifp->if_flags =
 	    IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS | IFF_MULTICAST;
-	IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
 
 	/* Print additional info when attached. */
 	printf("%s: address %s\n", sc->sc_dev.dv_xname,
diff --git a/sys/dev/ic/elink3.c b/sys/dev/ic/elink3.c
index 367d4c2a560..42985efc172 100644
--- a/sys/dev/ic/elink3.c
+++ b/sys/dev/ic/elink3.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: elink3.c,v 1.52 2001/06/27 06:34:41 kjc Exp $	*/
+/*	$OpenBSD: elink3.c,v 1.53 2001/07/08 23:38:05 fgsch Exp $	*/
 /*	$NetBSD: elink3.c,v 1.32 1997/05/14 00:22:00 thorpej Exp $	*/
 
 /*
@@ -353,7 +353,6 @@ epconfig(sc, chipset, enaddr)
 	ifp->if_watchdog = epwatchdog;
 	ifp->if_flags =
 	    IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS | IFF_MULTICAST;
-	IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
 	IFQ_SET_READY(&ifp->if_snd);
 
 	if_attach(ifp);
diff --git a/sys/dev/ic/if_wi.c b/sys/dev/ic/if_wi.c
index cfdb0f48eb8..24dea3e130f 100644
--- a/sys/dev/ic/if_wi.c
+++ b/sys/dev/ic/if_wi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wi.c,v 1.15 2001/06/27 06:34:42 kjc Exp $	*/
+/*	$OpenBSD: if_wi.c,v 1.16 2001/07/08 23:38:05 fgsch Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -120,7 +120,7 @@ u_int32_t	widebug = WIDEBUG;
 
 #if !defined(lint) && !defined(__OpenBSD__)
 static const char rcsid[] =
-	"$OpenBSD: if_wi.c,v 1.15 2001/06/27 06:34:42 kjc Exp $";
+	"$OpenBSD: if_wi.c,v 1.16 2001/07/08 23:38:05 fgsch Exp $";
 #endif	/* lint */
 
 #ifdef foo
@@ -197,7 +197,6 @@ wi_attach(sc, print_cis)
 	ifp->if_start = wi_start;
 	ifp->if_watchdog = wi_watchdog;
 	ifp->if_baudrate = 10000000;
-	IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
 	IFQ_SET_READY(&ifp->if_snd);
 
 	bzero(sc->wi_node_name, sizeof(sc->wi_node_name));
diff --git a/sys/dev/ic/rln.c b/sys/dev/ic/rln.c
index 0a541599fc1..4e2defddf7b 100644
--- a/sys/dev/ic/rln.c
+++ b/sys/dev/ic/rln.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rln.c,v 1.12 2001/06/27 06:34:43 kjc Exp $	*/
+/*	$OpenBSD: rln.c,v 1.13 2001/07/08 23:38:06 fgsch Exp $	*/
 /*
  * David Leonard <d@openbsd.org>, 1999. Public Domain.
  *
@@ -142,7 +142,6 @@ rlnconfig(sc)
 	ifp->if_ioctl = rlnioctl;
 	ifp->if_watchdog = rlnwatchdog;
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS;
-	IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
 	IFQ_SET_READY(&ifp->if_snd);
 	if_attach(ifp);
 	ether_ifattach(ifp);
diff --git a/sys/dev/ic/rtl81x9.c b/sys/dev/ic/rtl81x9.c
index 817985b8be6..fafe43dc950 100644
--- a/sys/dev/ic/rtl81x9.c
+++ b/sys/dev/ic/rtl81x9.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtl81x9.c,v 1.5 2001/06/27 06:34:43 kjc Exp $ */
+/*	$OpenBSD: rtl81x9.c,v 1.6 2001/07/08 23:38:06 fgsch Exp $ */
 
 /*
  * Copyright (c) 1997, 1998
@@ -1275,7 +1275,6 @@ rl_attach(sc)
 	ifp->if_start = rl_start;
 	ifp->if_watchdog = rl_watchdog;
 	ifp->if_baudrate = 10000000;
-	IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
 	IFQ_SET_READY(&ifp->if_snd);
 
 	bcopy(sc->sc_dev.dv_xname, ifp->if_xname, IFNAMSIZ);
diff --git a/sys/dev/ic/smc91cxx.c b/sys/dev/ic/smc91cxx.c
index d3eddb40d56..d2926830318 100644
--- a/sys/dev/ic/smc91cxx.c
+++ b/sys/dev/ic/smc91cxx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smc91cxx.c,v 1.12 2001/06/27 06:34:43 kjc Exp $	*/
+/*	$OpenBSD: smc91cxx.c,v 1.13 2001/07/08 23:38:06 fgsch Exp $	*/
 /*	$NetBSD: smc91cxx.c,v 1.11 1998/08/08 23:51:41 mycroft Exp $	*/
 
 /*-
@@ -248,7 +248,6 @@ smc91cxx_attach(sc, myea)
 	ifp->if_watchdog = smc91cxx_watchdog;
 	ifp->if_flags =
 	    IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS | IFF_MULTICAST;
-	IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
 	IFQ_SET_READY(&ifp->if_snd);
 
 	/* Attach the interface. */
diff --git a/sys/dev/isa/if_ed.c b/sys/dev/isa/if_ed.c
index 5b4d8d9b2f9..86b5e04cc74 100644
--- a/sys/dev/isa/if_ed.c
+++ b/sys/dev/isa/if_ed.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ed.c,v 1.45 2001/06/27 06:34:44 kjc Exp $	*/
+/*	$OpenBSD: if_ed.c,v 1.46 2001/07/08 23:38:07 fgsch Exp $	*/
 /*	$NetBSD: if_ed.c,v 1.105 1996/10/21 22:40:45 thorpej Exp $	*/
 
 /*
@@ -198,7 +198,6 @@ ed_pcmcia_isa_attach(parent, match, aux, pc_link)
 	struct isa_attach_args *ia = aux;
 	struct pcmciadevs *dev=pc_link->device;
 	int err;
-	extern int ifqmaxlen;
 	u_char enaddr[ETHER_ADDR_LEN];
 
 	if ((int)dev->param != -1)
@@ -230,7 +229,6 @@ ed_pcmcia_isa_attach(parent, match, aux, pc_link)
 		/* clear ED_NOTPRESENT, set ED_REATTACH if needed */
 		sc->spec_flags=pc_link->flags&PCMCIA_REATTACH?ED_REATTACH:0;
 		sc->type_str = dev->model;
-		IFQ_SET_MAXLEN(&sc->sc_arpcom.ac_if.if_snd, ifqmaxlen);
 		sc->sc_ic = ia->ia_ic;
 		return 1;
 	} else
diff --git a/sys/dev/isa/if_fe.c b/sys/dev/isa/if_fe.c
index 688345e7d9e..fb643a4a5e0 100644
--- a/sys/dev/isa/if_fe.c
+++ b/sys/dev/isa/if_fe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_fe.c,v 1.16 2001/06/27 06:34:46 kjc Exp $	*/
+/*	$OpenBSD: if_fe.c,v 1.17 2001/07/08 23:38:07 fgsch Exp $	*/
 
 /*
  * All Rights Reserved, Copyright (C) Fujitsu Limited 1995
@@ -1001,21 +1001,6 @@ feattach(parent, self, aux)
 	    IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS | IFF_MULTICAST;
 	IFQ_SET_READY(&ifp->if_snd);
 
-	/*
-	 * Set maximum size of output queue, if it has not been set.
-	 * It is done here as this driver may be started after the
-	 * system intialization (i.e., the interface is PCMCIA.)
-	 *
-	 * I'm not sure this is really necessary, but, even if it is,
-	 * it should be done somewhere else, e.g., in if_attach(),
-	 * since it must be a common workaround for all network drivers.
-	 * FIXME.
-	 */
-	if (ifp->if_snd.ifq_maxlen == 0) {
-		extern int ifqmaxlen;		/* Don't be so shocked... */
-		ifp->if_snd.ifq_maxlen = ifqmaxlen;
-	}
-
 #if FE_DEBUG >= 3
 	log(LOG_INFO, "%s: feattach()\n", sc->sc_dev.dv_xname);
 	fe_dump(LOG_INFO, sc);
diff --git a/sys/dev/pcmcia/if_xe.c b/sys/dev/pcmcia/if_xe.c
index 7c564bfab7b..f595a245531 100644
--- a/sys/dev/pcmcia/if_xe.c
+++ b/sys/dev/pcmcia/if_xe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_xe.c,v 1.21 2001/06/27 06:34:52 kjc Exp $	*/
+/*	$OpenBSD: if_xe.c,v 1.22 2001/07/08 23:38:07 fgsch Exp $	*/
 
 /*
  * Copyright (c) 1999 Niklas Hallqvist, Brandon Creighton, Job de Haas
@@ -382,7 +382,6 @@ xe_pcmcia_attach(parent, self, aux)
 	ifp->if_ioctl = xe_ioctl;
 	ifp->if_start = xe_start;
 	ifp->if_watchdog = xe_watchdog;
-	IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
 	IFQ_SET_READY(&ifp->if_snd);
 
 	/* Establish the interrupt. */
diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c
index 9b7552df8d4..aaba6032ac8 100644
--- a/sys/dev/usb/if_aue.c
+++ b/sys/dev/usb/if_aue.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_aue.c,v 1.14 2001/06/27 06:34:53 kjc Exp $ */
+/*	$OpenBSD: if_aue.c,v 1.15 2001/07/08 23:38:08 fgsch Exp $ */
 /*	$NetBSD: if_aue.c,v 1.55 2001/03/25 22:59:43 augustss Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -750,9 +750,6 @@ USB_ATTACH(aue)
 	ifp->if_ioctl = aue_ioctl;
 	ifp->if_start = aue_start;
 	ifp->if_watchdog = aue_watchdog;
-#if defined(__OpenBSD__)
-	IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
-#endif
 	IFQ_SET_READY(&ifp->if_snd);
 	strncpy(ifp->if_xname, USBDEVNAME(sc->aue_dev), IFNAMSIZ);
 
diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c
index 6917fdfa1d7..a391626dfb7 100644
--- a/sys/dev/usb/if_cue.c
+++ b/sys/dev/usb/if_cue.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_cue.c,v 1.9 2001/06/27 06:34:53 kjc Exp $ */
+/*	$OpenBSD: if_cue.c,v 1.10 2001/07/08 23:38:08 fgsch Exp $ */
 /*	$NetBSD: if_cue.c,v 1.34 2001/04/12 23:54:56 augustss Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -577,9 +577,6 @@ USB_ATTACH(cue)
 	ifp->if_ioctl = cue_ioctl;
 	ifp->if_start = cue_start;
 	ifp->if_watchdog = cue_watchdog;
-#if defined(__OpenBSD__)
-	IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
-#endif
 	IFQ_SET_READY(&ifp->if_snd);
 	strncpy(ifp->if_xname, USBDEVNAME(sc->cue_dev), IFNAMSIZ);
 
diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c
index 3ee0298c6c7..e9d835f31ec 100644
--- a/sys/dev/usb/if_kue.c
+++ b/sys/dev/usb/if_kue.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_kue.c,v 1.11 2001/06/27 06:34:53 kjc Exp $ */
+/*	$OpenBSD: if_kue.c,v 1.12 2001/07/08 23:38:08 fgsch Exp $ */
 /*	$NetBSD: if_kue.c,v 1.40 2001/04/08 02:10:57 augustss Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -518,9 +518,6 @@ USB_ATTACH(kue)
 	ifp->if_ioctl = kue_ioctl;
 	ifp->if_start = kue_start;
 	ifp->if_watchdog = kue_watchdog;
-#if defined(__OpenBSD__)
-	IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
-#endif
 	IFQ_SET_READY(&ifp->if_snd);
 	strncpy(ifp->if_xname, USBDEVNAME(sc->kue_dev), IFNAMSIZ);