Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/mac68k/nubus Eliminate use of IFF_OACTIVE.



details:   https://anonhg.NetBSD.org/src/rev/67465c5cff90
branches:  trunk
changeset: 370125:67465c5cff90
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sun Sep 18 02:45:38 2022 +0000

description:
Eliminate use of IFF_OACTIVE.

diffstat:

 sys/arch/mac68k/nubus/if_netdock_nubus.c |  13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)

diffs (62 lines):

diff -r 5890ef1b1b2c -r 67465c5cff90 sys/arch/mac68k/nubus/if_netdock_nubus.c
--- a/sys/arch/mac68k/nubus/if_netdock_nubus.c  Sun Sep 18 02:32:14 2022 +0000
+++ b/sys/arch/mac68k/nubus/if_netdock_nubus.c  Sun Sep 18 02:45:38 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_netdock_nubus.c,v 1.34 2020/02/04 07:40:53 skrll Exp $      */
+/*     $NetBSD: if_netdock_nubus.c,v 1.35 2022/09/18 02:45:38 thorpej Exp $    */
 
 /*
  * Copyright (C) 2000,2002 Daishi Kato <daishi%axlight.com@localhost>
@@ -43,7 +43,7 @@
 /***********************/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_netdock_nubus.c,v 1.34 2020/02/04 07:40:53 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_netdock_nubus.c,v 1.35 2022/09/18 02:45:38 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -439,7 +439,7 @@
        struct netdock_softc *sc = ifp->if_softc;
        struct mbuf *m;
 
-       if ((ifp->if_flags & (IFF_RUNNING | IFF_OACTIVE)) != IFF_RUNNING)
+       if ((ifp->if_flags & IFF_RUNNING) == 0)
                return;
 
        while (1) {
@@ -447,9 +447,7 @@
                if (m == 0)
                        return;
 
-               if ((m->m_flags & M_PKTHDR) == 0)
-                       panic("%s: netdock_start: no header mbuf",
-                           device_xname(sc->sc_dev));
+               KASSERT(m->m_flags & M_PKTHDR);
 
                bpf_mtap(ifp, m, BPF_D_OUT);
 
@@ -460,7 +458,6 @@
 
                if_statinc(ifp, if_opackets);
        }
-
 }
 
 static void
@@ -524,7 +521,6 @@
 
 
        sc->sc_if.if_flags |= IFF_RUNNING;
-       sc->sc_if.if_flags &= ~IFF_OACTIVE;
 
        splx(s);
        return (0);
@@ -663,7 +659,6 @@
        int reg0004;
        int regdata;
 
-       ifp->if_flags &= ~IFF_OACTIVE;
        ifp->if_timer = 0;
 
        savereg0002 = NIC_GET_2(sc, REG_0002);



Home | Main Index | Thread Index | Old Index