Module Name: src
Committed By: thorpej
Date: Thu Mar 19 14:06:32 UTC 2020
Modified Files:
src/sys/arch/sun3/dev: if_ie.c
Log Message:
Don't bother with IFF_OACTIVE. Just keep processing so long as
sc->xmit_busy is less than sc->ntxbuf.
To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/sys/arch/sun3/dev/if_ie.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/sun3/dev/if_ie.c
diff -u src/sys/arch/sun3/dev/if_ie.c:1.71 src/sys/arch/sun3/dev/if_ie.c:1.72
--- src/sys/arch/sun3/dev/if_ie.c:1.71 Wed Jan 29 05:39:48 2020
+++ src/sys/arch/sun3/dev/if_ie.c Thu Mar 19 14:06:32 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ie.c,v 1.71 2020/01/29 05:39:48 thorpej Exp $ */
+/* $NetBSD: if_ie.c,v 1.72 2020/03/19 14:06:32 thorpej Exp $ */
/*-
* Copyright (c) 1993, 1994, 1995 Charles M. Hannum.
@@ -98,7 +98,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.71 2020/01/29 05:39:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.72 2020/03/19 14:06:32 thorpej Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
@@ -583,7 +583,6 @@ ietint(struct ie_softc *sc)
ifp = &sc->sc_if;
ifp->if_timer = 0;
- ifp->if_flags &= ~IFF_OACTIVE;
status = sc->xmit_cmds[sc->xctail]->ie_xmit_status;
@@ -959,15 +958,10 @@ iestart(struct ifnet *ifp)
uint8_t *buffer;
uint16_t len;
- if ((ifp->if_flags & (IFF_RUNNING | IFF_OACTIVE)) != IFF_RUNNING)
+ if ((ifp->if_flags & IFF_RUNNING) != IFF_RUNNING)
return;
- for (;;) {
- if (sc->xmit_busy == sc->ntxbuf) {
- ifp->if_flags |= IFF_OACTIVE;
- break;
- }
-
+ while (sc->xmit_busy < sc->ntxbuf) {
IF_DEQUEUE(&ifp->if_snd, m0);
if (m0 == 0)
break;
@@ -1389,7 +1383,6 @@ ieinit(struct ie_softc *sc)
/* tell higher levels that we are here */
ifp->if_flags |= IFF_RUNNING;
- ifp->if_flags &= ~IFF_OACTIVE;
sc->scb->ie_recv_list =
vtop16sw(sc, __UNVOLATILE(sc->rframes[0]));
