Module Name: src
Committed By: thorpej
Date: Sat Sep 17 19:44:14 UTC 2022
Modified Files:
src/sys/arch/arm/ep93xx: epe.c epevar.h
Log Message:
Eliminate use of IFF_OACTIVE.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/arm/ep93xx/epe.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/ep93xx/epevar.h
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/arm/ep93xx/epe.c
diff -u src/sys/arch/arm/ep93xx/epe.c:1.48 src/sys/arch/arm/ep93xx/epe.c:1.49
--- src/sys/arch/arm/ep93xx/epe.c:1.48 Wed Feb 19 02:51:54 2020
+++ src/sys/arch/arm/ep93xx/epe.c Sat Sep 17 19:44:13 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: epe.c,v 1.48 2020/02/19 02:51:54 thorpej Exp $ */
+/* $NetBSD: epe.c,v 1.49 2022/09/17 19:44:13 thorpej Exp $ */
/*
* Copyright (c) 2004 Jesse Off
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: epe.c,v 1.48 2020/02/19 02:51:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epe.c,v 1.49 2022/09/17 19:44:13 thorpej Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -189,8 +189,8 @@ epe_gctx(struct epe_softc *sc)
} while (sc->TXStsQ_cur != cur);
sc->TXDQ_avail += ndq;
- if (ifp->if_flags & IFF_OACTIVE) {
- ifp->if_flags &= ~IFF_OACTIVE;
+ if (sc->tx_busy) {
+ sc->tx_busy = false;
/* Disable end-of-tx-chain interrupt */
EPE_WRITE(IntEn, IntEn_REOFIE);
}
@@ -544,7 +544,7 @@ start:
if (epe_gctx(sc) == 0) {
/* Enable End-Of-TX-Chain interrupt */
EPE_WRITE(IntEn, IntEn_REOFIE | IntEn_ECIE);
- ifp->if_flags |= IFF_OACTIVE;
+ sc->tx_busy = true;
ifp->if_timer = 10;
splx(s);
return;
@@ -687,7 +687,7 @@ epe_ifstop(struct ifnet *ifp, int disabl
/* Down the MII. */
mii_down(&sc->sc_mii);
- ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE);
+ ifp->if_flags &= ~IFF_RUNNING;
ifp->if_timer = 0;
sc->sc_mii.mii_media_status &= ~IFM_ACTIVE;
}
Index: src/sys/arch/arm/ep93xx/epevar.h
diff -u src/sys/arch/arm/ep93xx/epevar.h:1.7 src/sys/arch/arm/ep93xx/epevar.h:1.8
--- src/sys/arch/arm/ep93xx/epevar.h:1.7 Mon Nov 12 18:00:36 2012
+++ src/sys/arch/arm/ep93xx/epevar.h Sat Sep 17 19:44:13 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: epevar.h,v 1.7 2012/11/12 18:00:36 skrll Exp $ */
+/* $NetBSD: epevar.h,v 1.8 2022/09/17 19:44:13 thorpej Exp $ */
/*-
* Copyright (c) 2004 Jesse Off
* All rights reserved
@@ -60,6 +60,7 @@ struct epe_softc {
struct epe_qmeta rxq[RX_QLEN];
struct epe_qmeta txq[TX_QLEN];
struct callout epe_tick_ch;
+ bool tx_busy;
};
#endif /* _EPEVAR_H_ */
