Module Name: src
Committed By: riastradh
Date: Mon Oct 9 11:55:22 UTC 2023
Modified Files:
src/sys/dev/pci: if_rge.c
Log Message:
rge(4): callout_stop can't be right here; just do callout_halt.
XXX pullup-10
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/pci/if_rge.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_rge.c
diff -u src/sys/dev/pci/if_rge.c:1.26 src/sys/dev/pci/if_rge.c:1.27
--- src/sys/dev/pci/if_rge.c:1.26 Thu Oct 5 21:43:02 2023
+++ src/sys/dev/pci/if_rge.c Mon Oct 9 11:55:22 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rge.c,v 1.26 2023/10/05 21:43:02 mrg Exp $ */
+/* $NetBSD: if_rge.c,v 1.27 2023/10/09 11:55:22 riastradh Exp $ */
/* $OpenBSD: if_rge.c,v 1.9 2020/12/12 11:48:53 jan Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rge.c,v 1.26 2023/10/05 21:43:02 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rge.c,v 1.27 2023/10/09 11:55:22 riastradh Exp $");
#include <sys/types.h>
@@ -840,10 +840,7 @@ rge_stop(struct ifnet *ifp, int disable)
{
struct rge_softc *sc = ifp->if_softc;
- if (disable) {
- callout_halt(&sc->sc_timeout, NULL);
- } else
- callout_stop(&sc->sc_timeout);
+ callout_halt(&sc->sc_timeout, NULL);
ifp->if_timer = 0;
ifp->if_flags &= ~IFF_RUNNING;
