[src/trunk]: src/sys/arch/arm/sunxi Eliminate use of IFF_OACTIVE.

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

details:   https://anonhg.NetBSD.org/src/rev/920fba6a6b48
branches:  trunk
changeset: 370141:920fba6a6b48
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sun Sep 18 15:28:01 2022 +0000

description:
Eliminate use of IFF_OACTIVE.

diffstat:

 sys/arch/arm/sunxi/sunxi_can.c |  13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diffs (62 lines):

diff -r 1a26071bd10b -r 920fba6a6b48 sys/arch/arm/sunxi/sunxi_can.c
--- a/sys/arch/arm/sunxi/sunxi_can.c    Sun Sep 18 15:14:06 2022 +0000
+++ b/sys/arch/arm/sunxi/sunxi_can.c    Sun Sep 18 15:28:01 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sunxi_can.c,v 1.8 2021/01/27 03:10:20 thorpej Exp $    */
+/*     $NetBSD: sunxi_can.c,v 1.9 2022/09/18 15:28:01 thorpej Exp $    */
 
 /*-
  * Copyright (c) 2017,2018 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: sunxi_can.c,v 1.8 2021/01/27 03:10:20 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: sunxi_can.c,v 1.9 2022/09/18 15:28:01 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -313,7 +313,6 @@
                sc->sc_m_transmit = NULL;
                ifp->if_timer = 0;
        }
-       ifp->if_flags &= ~IFF_OACTIVE;
        if_schedule_deferred_start(ifp);
 }
 
@@ -327,8 +326,7 @@
                sc->sc_ifp->if_timer = 0;
                /*
                 * the transmit abort will trigger a TX interrupt
-                * which will restart the queue or cleae OACTIVE,
-                * as appropriate
+                * which will restart the queue as appropriate.
                 */
                sunxi_can_write(sc, SUNXI_CAN_CMD_REG, SUNXI_CAN_CMD_ABT_REQ);
                return 1;
@@ -418,7 +416,7 @@
        int i;
 
        mutex_enter(&sc->sc_intr_lock);
-       if (ifp->if_flags & IFF_OACTIVE)
+       if (sc->sc_m_transmit != NULL)
                goto out;
 
        IF_DEQUEUE(&ifp->if_snd, m);
@@ -467,7 +465,6 @@
        } else {
                sunxi_can_write(sc, SUNXI_CAN_CMD_REG, SUNXI_CAN_CMD_TANS_REQ);
        }
-       ifp->if_flags |= IFF_OACTIVE;
        ifp->if_timer = 5;
        can_bpf_mtap(ifp, m, 0);
 out:
@@ -536,7 +533,7 @@
 static void
 sunxi_can_ifdown(struct sunxi_can_softc * const sc)
 {
-       sc->sc_ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE);
+       sc->sc_ifp->if_flags &= ~IFF_RUNNING;
        sc->sc_ifp->if_timer = 0;
        sunxi_can_enter_reset(sc);
        sunxi_can_write(sc, SUNXI_CAN_INTE_REG, 0);