Module Name: src
Committed By: thorpej
Date: Sat Sep 17 15:33:53 UTC 2022
Modified Files:
src/sys/dev/pci: if_vr.c
Log Message:
Eliminate use of IFF_OACTIVE.
To generate a diff of this commit:
cvs rdiff -u -r1.135 -r1.136 src/sys/dev/pci/if_vr.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/dev/pci/if_vr.c
diff -u src/sys/dev/pci/if_vr.c:1.135 src/sys/dev/pci/if_vr.c:1.136
--- src/sys/dev/pci/if_vr.c:1.135 Sat Jul 24 22:30:59 2021
+++ src/sys/dev/pci/if_vr.c Sat Sep 17 15:33:52 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vr.c,v 1.135 2021/07/24 22:30:59 andvar Exp $ */
+/* $NetBSD: if_vr.c,v 1.136 2022/09/17 15:33:52 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.135 2021/07/24 22:30:59 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.136 2022/09/17 15:33:52 thorpej Exp $");
@@ -839,8 +839,6 @@ vr_txeof(struct vr_softc *sc)
uint32_t txstat;
int i, j;
- ifp->if_flags &= ~IFF_OACTIVE;
-
/*
* Go through our tx list and free mbufs for those
* frames that have been transmitted.
@@ -1012,7 +1010,7 @@ vr_start(struct ifnet *ifp)
struct vr_descsoft *ds;
int error, firsttx, nexttx, opending;
- if ((ifp->if_flags & (IFF_RUNNING | IFF_OACTIVE)) != IFF_RUNNING)
+ if ((ifp->if_flags & IFF_RUNNING) == 0)
return;
if (sc->vr_link == false)
return;
@@ -1138,11 +1136,6 @@ vr_start(struct ifnet *ifp)
sc->vr_txlast = nexttx;
}
- if (sc->vr_txpending == VR_NTXDESC) {
- /* No more slots left; notify upper layer. */
- ifp->if_flags |= IFF_OACTIVE;
- }
-
if (sc->vr_txpending != opending) {
/*
* We enqueued packets. If the transmitter was idle,
@@ -1280,7 +1273,6 @@ vr_init(struct ifnet *ifp)
CSR_WRITE_2(sc, VR_IMR, VR_INTRS);
ifp->if_flags |= IFF_RUNNING;
- ifp->if_flags &= ~IFF_OACTIVE;
/* Start one second timer. */
callout_schedule(&sc->vr_tick_ch, hz);
@@ -1427,7 +1419,7 @@ vr_stop(struct ifnet *ifp, int disable)
/*
* Mark the interface down and cancel the watchdog timer.
*/
- ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE);
+ ifp->if_flags &= ~IFF_RUNNING;
ifp->if_timer = 0;
if (disable)
