Module Name: src
Committed By: thorpej
Date: Sun Sep 18 11:25:34 UTC 2022
Modified Files:
src/sys/arch/mips/alchemy/dev: if_aumac.c
Log Message:
Eliminate use of IFF_OACTIVE.
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/mips/alchemy/dev/if_aumac.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/alchemy/dev/if_aumac.c
diff -u src/sys/arch/mips/alchemy/dev/if_aumac.c:1.49 src/sys/arch/mips/alchemy/dev/if_aumac.c:1.50
--- src/sys/arch/mips/alchemy/dev/if_aumac.c:1.49 Tue Sep 29 02:58:52 2020
+++ src/sys/arch/mips/alchemy/dev/if_aumac.c Sun Sep 18 11:25:33 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_aumac.c,v 1.49 2020/09/29 02:58:52 msaitoh Exp $ */
+/* $NetBSD: if_aumac.c,v 1.50 2022/09/18 11:25:33 thorpej Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_aumac.c,v 1.49 2020/09/29 02:58:52 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aumac.c,v 1.50 2022/09/18 11:25:33 thorpej Exp $");
@@ -395,7 +395,7 @@ aumac_start(struct ifnet *ifp)
struct mbuf *m;
int nexttx;
- if ((ifp->if_flags & (IFF_RUNNING | IFF_OACTIVE)) != IFF_RUNNING)
+ if ((ifp->if_flags & IFF_RUNNING) == 0)
return;
/*
@@ -411,8 +411,7 @@ aumac_start(struct ifnet *ifp)
/* Get a spare descriptor. */
if (sc->sc_txfree == 0) {
- /* No more slots left; notify upper layer. */
- ifp->if_flags |= IFF_OACTIVE;
+ /* No more slots left. */
AUMAC_EVCNT_INCR(&sc->sc_ev_txstall);
return;
}
@@ -579,7 +578,6 @@ aumac_txintr(struct aumac_softc *sc)
IF_STAT_PUTREF(ifp);
sc->sc_txfree++;
- ifp->if_flags &= ~IFF_OACTIVE;
/* Try to queue more packets. */
if_schedule_deferred_start(ifp);
@@ -810,7 +808,6 @@ aumac_init(struct ifnet *ifp)
/* ...all done! */
ifp->if_flags |= IFF_RUNNING;
- ifp->if_flags &= ~IFF_OACTIVE;
au_intr_enable(sc->sc_irq);
out:
@@ -844,7 +841,7 @@ aumac_stop(struct ifnet *ifp, int disabl
au_intr_disable(sc->sc_irq);
/* Mark the interface as down and cancel the watchdog timer. */
- ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE);
+ ifp->if_flags &= ~IFF_RUNNING;
ifp->if_timer = 0;
}
