CVS commit: [netbsd-10] src/sys/dev/pci

[Martin Husemann]

Module Name:    src
Committed By:   martin
Date:           Sat Oct 14 06:59:43 UTC 2023

Modified Files:
        src/sys/dev/pci [netbsd-10]: if_rge.c

Log Message:
Pull up following revision(s) (requested by riastradh in ticket #414):

        sys/dev/pci/if_rge.c: revision 1.27

rge(4): callout_stop can't be right here; just do callout_halt.


To generate a diff of this commit:
cvs rdiff -u -r1.24.4.1 -r1.24.4.2 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.24.4.1 src/sys/dev/pci/if_rge.c:1.24.4.2
--- src/sys/dev/pci/if_rge.c:1.24.4.1	Wed Dec 21 09:36:42 2022
+++ src/sys/dev/pci/if_rge.c	Sat Oct 14 06:59:43 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_rge.c,v 1.24.4.1 2022/12/21 09:36:42 martin Exp $	*/
+/*	$NetBSD: if_rge.c,v 1.24.4.2 2023/10/14 06:59:43 martin 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.24.4.1 2022/12/21 09:36:42 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rge.c,v 1.24.4.2 2023/10/14 06:59:43 martin Exp $");
 
 #include <sys/types.h>
 
@@ -838,10 +838,7 @@ rge_stop(struct ifnet *ifp, int disable)
 	struct rge_softc *sc = ifp->if_softc;
 	int i;
 
-	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;