Module Name: src
Committed By: thorpej
Date: Sat Sep 17 18:58:49 UTC 2022
Modified Files:
src/sys/arch/acorn32/podulebus: if_ie.c
Log Message:
Eliminate use of IFF_OACTIVE.
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/acorn32/podulebus/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/acorn32/podulebus/if_ie.c
diff -u src/sys/arch/acorn32/podulebus/if_ie.c:1.52 src/sys/arch/acorn32/podulebus/if_ie.c:1.53
--- src/sys/arch/acorn32/podulebus/if_ie.c:1.52 Fri Apr 8 10:17:53 2022
+++ src/sys/arch/acorn32/podulebus/if_ie.c Sat Sep 17 18:58:49 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ie.c,v 1.52 2022/04/08 10:17:53 andvar Exp $ */
+/* $NetBSD: if_ie.c,v 1.53 2022/09/17 18:58:49 thorpej Exp $ */
/*
* Copyright (c) 1995 Melvin Tang-Richardson.
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.52 2022/04/08 10:17:53 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.53 2022/09/17 18:58:49 thorpej Exp $");
#define IGNORE_ETHER1_IDROM_CHECKSUM
@@ -909,7 +909,6 @@ ieinit(struct ie_softc *sc)
ptr = setup_rfa(sc, ptr);
ifp->if_flags |= IFF_RUNNING;
- ifp->if_flags &= ~IFF_OACTIVE;
/* Setup transmit buffers */
@@ -1452,20 +1451,13 @@ iestart(struct ifnet *ifp)
char txbuf[IE_TXBUF_SIZE];
int safety_catch = 0;
- if ((ifp->if_flags & IFF_OACTIVE) != 0)
- return;
-
- for (;;) {
+ while (sc->xmit_free != 0) {
if ( (safety_catch++)>100 )
{
printf ( "ie: iestart safety catch tripped\n" );
iereset(sc);
return;
}
- if (sc->xmit_free == 0) {
- ifp->if_flags |= IFF_OACTIVE;
- break;
- }
IF_DEQUEUE(&ifp->if_snd, m);
if (!m)
@@ -1520,7 +1512,6 @@ ietint(struct ie_softc *sc)
int status;
ifp->if_timer=0;
- ifp->if_flags &= ~IFF_OACTIVE;
READ_MEMBER(sc,struct ie_xmit_cmd, ie_xmit_status,
sc->xmit_cmds[sc->xctail], status );
