[src/trunk]: src/sys/dev ALTQ'ify.

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cf25bade5765
branches:  trunk
changeset: 500591:cf25bade5765
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Thu Dec 14 07:15:45 2000 +0000

description:
ALTQ'ify.

diffstat:

 sys/dev/qbus/if_de.c |   6 ++++--
 sys/dev/qbus/if_qe.c |  10 ++++++----
 sys/dev/sbus/be.c    |   5 +++--
 sys/dev/sbus/qe.c    |   5 +++--
 4 files changed, 16 insertions(+), 10 deletions(-)

diffs (120 lines):

diff -r bb560fe86035 -r cf25bade5765 sys/dev/qbus/if_de.c
--- a/sys/dev/qbus/if_de.c      Thu Dec 14 07:03:50 2000 +0000
+++ b/sys/dev/qbus/if_de.c      Thu Dec 14 07:15:45 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_de.c,v 1.7 2000/11/15 01:02:19 thorpej Exp $        */
+/*     $NetBSD: if_de.c,v 1.8 2000/12/14 07:15:45 thorpej Exp $        */
 
 /*
  * Copyright (c) 1982, 1986, 1989 Regents of the University of California.
@@ -289,6 +289,8 @@
        ifp->if_flags = IFF_BROADCAST|IFF_SIMPLEX|IFF_MULTICAST|IFF_ALLMULTI;
        ifp->if_ioctl = deioctl;
        ifp->if_start = destart;
+       IFQ_SET_READY(&ifp->if_snd);
+
        if_attach(ifp);
        ether_ifattach(ifp, myaddr);
 
@@ -428,7 +430,7 @@
                return;
        dc = sc->sc_dedata;
        for (nxmit = sc->sc_nxmit; nxmit < NXMT; nxmit++) {
-               IF_DEQUEUE(&sc->sc_if.if_snd, m);
+               IFQ_DEQUEUE(&ifp->if_snd, m);
                if (m == 0)
                        break;
                rp = &dc->dc_xrent[sc->sc_xfree];
diff -r bb560fe86035 -r cf25bade5765 sys/dev/qbus/if_qe.c
--- a/sys/dev/qbus/if_qe.c      Thu Dec 14 07:03:50 2000 +0000
+++ b/sys/dev/qbus/if_qe.c      Thu Dec 14 07:15:45 2000 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: if_qe.c,v 1.44 2000/11/15 01:02:19 thorpej Exp $ */
+/*      $NetBSD: if_qe.c,v 1.45 2000/12/14 07:15:45 thorpej Exp $ */
 /*
  * Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved.
  *
@@ -359,6 +359,7 @@
        ifp->if_start = qestart;
        ifp->if_ioctl = qeioctl;
        ifp->if_watchdog = qetimeout;
+       IFQ_SET_READY(&ifp->if_snd);
 
        /*
         * Attach the interface.
@@ -487,7 +488,7 @@
                        continue;
                }
                idx = sc->sc_nexttx;
-               IF_DEQUEUE(&sc->sc_if.if_snd, m);
+               IFQ_POLL(&ifp->if_snd, m);
                if (m == 0)
                        goto out;
                /*
@@ -502,11 +503,12 @@
                        panic("qestart");
 
                if ((i + sc->sc_inq) >= (TXDESCS - 1)) {
-                       IF_PREPEND(&sc->sc_if.if_snd, m);
                        ifp->if_flags |= IFF_OACTIVE;
                        goto out;
                }
-               
+
+               IFQ_DEQUEUE(&ifp->if_snd, m);
+
 #if NBPFILTER > 0
                if (ifp->if_bpf)
                        bpf_mtap(ifp->if_bpf, m);
diff -r bb560fe86035 -r cf25bade5765 sys/dev/sbus/be.c
--- a/sys/dev/sbus/be.c Thu Dec 14 07:03:50 2000 +0000
+++ b/sys/dev/sbus/be.c Thu Dec 14 07:15:45 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: be.c,v 1.22 2000/11/15 01:02:19 thorpej Exp $  */
+/*     $NetBSD: be.c,v 1.23 2000/12/14 07:24:21 thorpej Exp $  */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -470,6 +470,7 @@
        ifp->if_watchdog = bewatchdog;
        ifp->if_flags =
                IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS | IFF_MULTICAST;
+       IFQ_SET_READY(&ifp->if_snd);
 
        /* Attach the interface. */
        if_attach(ifp);
@@ -631,7 +632,7 @@
        bix = sc->sc_rb.rb_tdhead;
 
        for (;;) {
-               IF_DEQUEUE(&ifp->if_snd, m);
+               IFQ_DEQUEUE(&ifp->if_snd, m);
                if (m == 0)
                        break;
 
diff -r bb560fe86035 -r cf25bade5765 sys/dev/sbus/qe.c
--- a/sys/dev/sbus/qe.c Thu Dec 14 07:03:50 2000 +0000
+++ b/sys/dev/sbus/qe.c Thu Dec 14 07:15:45 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: qe.c,v 1.12 2000/11/15 01:02:19 thorpej Exp $  */
+/*     $NetBSD: qe.c,v 1.13 2000/12/14 07:24:22 thorpej Exp $  */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -323,6 +323,7 @@
        ifp->if_watchdog = qewatchdog;
        ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS |
            IFF_MULTICAST;
+       IFQ_SET_READY(&ifp->if_snd);
 
        /* Attach the interface. */
        if_attach(ifp);
@@ -484,7 +485,7 @@
        bix = sc->sc_rb.rb_tdhead;
 
        for (;;) {
-               IF_DEQUEUE(&ifp->if_snd, m);
+               IFQ_DEQUEUE(&ifp->if_snd, m);
                if (m == 0)
                        break;