[src/trunk]: src/sys/dev/pci Eliminate use of IFF_OACTIVE.

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

details:   https://anonhg.NetBSD.org/src/rev/aa5644b352f2
branches:  trunk
changeset: 370102:aa5644b352f2
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sat Sep 17 15:33:52 2022 +0000

description:
Eliminate use of IFF_OACTIVE.

diffstat:

 sys/dev/pci/if_vr.c |  16 ++++------------
 1 files changed, 4 insertions(+), 12 deletions(-)

diffs (65 lines):

diff -r 4d82e18095b0 -r aa5644b352f2 sys/dev/pci/if_vr.c
--- a/sys/dev/pci/if_vr.c       Sat Sep 17 15:31:29 2022 +0000
+++ b/sys/dev/pci/if_vr.c       Sat Sep 17 15:33:52 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_vr.c,v 1.135 2021/07/24 22:30:59 andvar Exp $       */
+/*     $NetBSD: if_vr.c,v 1.136 2022/09/17 15:33:52 thorpej Exp $      */
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.135 2021/07/24 22:30:59 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.136 2022/09/17 15:33:52 thorpej Exp $");
 
 
 
@@ -839,8 +839,6 @@
        uint32_t txstat;
        int i, j;
 
-       ifp->if_flags &= ~IFF_OACTIVE;
-
        /*
         * Go through our tx list and free mbufs for those
         * frames that have been transmitted.
@@ -1012,7 +1010,7 @@
        struct vr_descsoft *ds;
        int error, firsttx, nexttx, opending;
 
-       if ((ifp->if_flags & (IFF_RUNNING | IFF_OACTIVE)) != IFF_RUNNING)
+       if ((ifp->if_flags & IFF_RUNNING) == 0)
                return;
        if (sc->vr_link == false)
                return;
@@ -1138,11 +1136,6 @@
                sc->vr_txlast = nexttx;
        }
 
-       if (sc->vr_txpending == VR_NTXDESC) {
-               /* No more slots left; notify upper layer. */
-               ifp->if_flags |= IFF_OACTIVE;
-       }
-
        if (sc->vr_txpending != opending) {
                /*
                 * We enqueued packets.  If the transmitter was idle,
@@ -1280,7 +1273,6 @@
        CSR_WRITE_2(sc, VR_IMR, VR_INTRS);
 
        ifp->if_flags |= IFF_RUNNING;
-       ifp->if_flags &= ~IFF_OACTIVE;
 
        /* Start one second timer. */
        callout_schedule(&sc->vr_tick_ch, hz);
@@ -1427,7 +1419,7 @@
        /*
         * Mark the interface down and cancel the watchdog timer.
         */
-       ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE);
+       ifp->if_flags &= ~IFF_RUNNING;
        ifp->if_timer = 0;
 
        if (disable)