Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/next68k/dev Eliminate use of IFF_OACTIVE. (It was ...



details:   https://anonhg.NetBSD.org/src/rev/1f430d3abf7f
branches:  trunk
changeset: 370130:1f430d3abf7f
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sun Sep 18 13:00:18 2022 +0000

description:
Eliminate use of IFF_OACTIVE.  (It was not being used correctly here in
any case.)

diffstat:

 sys/arch/next68k/dev/mb8795.c |  15 ++++-----------
 1 files changed, 4 insertions(+), 11 deletions(-)

diffs (65 lines):

diff -r 1986feed2a8f -r 1f430d3abf7f sys/arch/next68k/dev/mb8795.c
--- a/sys/arch/next68k/dev/mb8795.c     Sun Sep 18 12:49:34 2022 +0000
+++ b/sys/arch/next68k/dev/mb8795.c     Sun Sep 18 13:00:18 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mb8795.c,v 1.68 2022/03/17 08:08:03 andvar Exp $       */
+/*     $NetBSD: mb8795.c,v 1.69 2022/09/18 13:00:18 thorpej Exp $      */
 /*
  * Copyright (c) 1998 Darrin B. Jewell
  * All rights reserved.
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mb8795.c,v 1.68 2022/03/17 08:08:03 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mb8795.c,v 1.69 2022/09/18 13:00:18 thorpej Exp $");
 
 #include "opt_inet.h"
 
@@ -430,7 +430,7 @@
 
        DPRINTF (("%s: mb8795_reset()\n", device_xname(sc->sc_dev)));
 
-       sc->sc_ethercom.ec_if.if_flags &= ~(IFF_RUNNING | IFF_OACTIVE);
+       sc->sc_ethercom.ec_if.if_flags &= ~IFF_RUNNING;
        sc->sc_ethercom.ec_if.if_timer = 0;
 
        MBDMA_RESET(sc);
@@ -526,7 +526,6 @@
                        MBDMA_TX_SETUP(sc);
 
                        ifp->if_flags |= IFF_RUNNING;
-                       ifp->if_flags &= ~IFF_OACTIVE;
                        ifp->if_timer = 0;
 
                        MBDMA_RX_GO(sc);
@@ -674,19 +673,15 @@
 #endif
 
        while (1) {
-               if ((ifp->if_flags & (IFF_RUNNING | IFF_OACTIVE))
-                   != IFF_RUNNING)
+               if ((ifp->if_flags & IFF_RUNNING) == 0)
                        return;
 
 #if 0
                return; /* @@@ Turn off xmit for debugging */
 #endif
 
-               ifp->if_flags |= IFF_OACTIVE;
-
                IFQ_DEQUEUE(&ifp->if_snd, m);
                if (m == 0) {
-                       ifp->if_flags &= ~IFF_OACTIVE;
                        return;
                }
 
@@ -698,8 +693,6 @@
                if (!MBDMA_TX_ISACTIVE(sc))
                        mb8795_start_dma(sc);
                splx(s);
-
-               ifp->if_flags &= ~IFF_OACTIVE;
        }
 }
 



Home | Main Index | Thread Index | Old Index