diff options
| author | itojun <itojun@NetBSD.org> | 2002-03-05 04:12:57 +0000 |
|---|---|---|
| committer | itojun <itojun@NetBSD.org> | 2002-03-05 04:12:57 +0000 |
| commit | ac36f7cb2c4f72b86e6d2b681ac6e29f4cfaeab9 (patch) | |
| tree | 445a5cc94468e541a8b928a5ad54928dc33b1d22 /sys/dev/ic | |
| parent | 69881cf6b8dc615ac34107b2f982835e042159e3 (diff) | |
bring in latest ALTQ from kjc. ALTQify some of the drivers.
Diffstat (limited to 'sys/dev/ic')
| -rw-r--r-- | sys/dev/ic/hd64570.c | 7 | ||||
| -rw-r--r-- | sys/dev/ic/midway.c | 5 | ||||
| -rw-r--r-- | sys/dev/ic/pdq_ifsubr.c | 5 |
3 files changed, 10 insertions, 7 deletions
diff --git a/sys/dev/ic/hd64570.c b/sys/dev/ic/hd64570.c index 361507224a6..8ffeb122342 100644 --- a/sys/dev/ic/hd64570.c +++ b/sys/dev/ic/hd64570.c @@ -1,4 +1,4 @@ -/* $NetBSD: hd64570.c,v 1.20 2001/11/13 13:14:37 lukem Exp $ */ +/* $NetBSD: hd64570.c,v 1.21 2002/03/05 04:12:57 itojun Exp $ */ /* * Copyright (c) 1999 Christian E. Hopps @@ -65,7 +65,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hd64570.c,v 1.20 2001/11/13 13:14:37 lukem Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hd64570.c,v 1.21 2002/03/05 04:12:57 itojun Exp $"); #include "bpfilter.h" #include "opt_inet.h" @@ -458,6 +458,7 @@ sca_port_attach(struct sca_softc *sc, u_int port) #ifdef SCA_USE_FASTQ scp->fastq.ifq_maxlen = IFQ_MAXLEN; #endif + IFQ_SET_READY(&ifp->if_snd); if_attach(ifp); if_alloc_sadl(ifp); @@ -1068,7 +1069,7 @@ sca_start(ifp) IF_DEQUEUE(&scp->fastq, mb_head); if (mb_head == NULL) #endif - IF_DEQUEUE(&ifp->if_snd, mb_head); + IFQ_DEQUEUE(&ifp->if_snd, mb_head); if (mb_head == NULL) goto start_xmit; diff --git a/sys/dev/ic/midway.c b/sys/dev/ic/midway.c index 947573adb6d..a446f144d61 100644 --- a/sys/dev/ic/midway.c +++ b/sys/dev/ic/midway.c @@ -1,4 +1,4 @@ -/* $NetBSD: midway.c,v 1.57 2002/02/11 11:19:29 wiz Exp $ */ +/* $NetBSD: midway.c,v 1.58 2002/03/05 04:12:57 itojun Exp $ */ /* (sync'd to midway.c 1.68) */ /* @@ -68,7 +68,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: midway.c,v 1.57 2002/02/11 11:19:29 wiz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: midway.c,v 1.58 2002/03/05 04:12:57 itojun Exp $"); #undef EN_DEBUG #undef EN_DEBUG_RANGE /* check ranges on en_read/en_write's? */ @@ -812,6 +812,7 @@ done_probe: ifp->if_ioctl = en_ioctl; ifp->if_output = atm_output; ifp->if_start = en_start; + IFQ_SET_READY(&ifp->if_snd); /* * init softc diff --git a/sys/dev/ic/pdq_ifsubr.c b/sys/dev/ic/pdq_ifsubr.c index 0324469ed71..54a77eedd38 100644 --- a/sys/dev/ic/pdq_ifsubr.c +++ b/sys/dev/ic/pdq_ifsubr.c @@ -1,4 +1,4 @@ -/* $NetBSD: pdq_ifsubr.c,v 1.38 2001/12/21 23:21:47 matt Exp $ */ +/* $NetBSD: pdq_ifsubr.c,v 1.39 2002/03/05 04:12:58 itojun Exp $ */ /*- * Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com> @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pdq_ifsubr.c,v 1.38 2001/12/21 23:21:47 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pdq_ifsubr.c,v 1.39 2002/03/05 04:12:58 itojun Exp $"); #ifdef __NetBSD__ #include "opt_inet.h" @@ -562,6 +562,7 @@ pdq_ifattach( ifp->if_output = fddi_output; #endif ifp->if_start = pdq_ifstart; + IFQ_SET_READY(&ifp->if_snd); #if defined(IFM_FDDI) { |
