CVS commit: src/sys/dev/pci

[Nick Hudson]

Module Name:    src
Committed By:   skrll
Date:           Fri Aug 19 07:48:43 UTC 2022

Modified Files:
        src/sys/dev/pci: if_bge.c if_bgevar.h

Log Message:
softc member naming consistency with wm(4). (Taylor made me do it... not
really)


To generate a diff of this commit:
cvs rdiff -u -r1.378 -r1.379 src/sys/dev/pci/if_bge.c
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/pci/if_bgevar.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/dev/pci/if_bge.c
diff -u src/sys/dev/pci/if_bge.c:1.378 src/sys/dev/pci/if_bge.c:1.379
--- src/sys/dev/pci/if_bge.c:1.378	Fri Aug 19 07:43:54 2022
+++ src/sys/dev/pci/if_bge.c	Fri Aug 19 07:48:43 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_bge.c,v 1.378 2022/08/19 07:43:54 skrll Exp $	*/
+/*	$NetBSD: if_bge.c,v 1.379 2022/08/19 07:48:43 skrll Exp $	*/
 
 /*
  * Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.378 2022/08/19 07:43:54 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.379 2022/08/19 07:48:43 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -6048,7 +6048,7 @@ bge_watchdog(struct ifnet *ifp)
 
 	KASSERT(mutex_owned(sc->sc_core_lock));
 
-	if (!sc->sc_triggerreset && bge_watchdog_check(sc))
+	if (!sc->sc_trigger_reset && bge_watchdog_check(sc))
 		return true;
 
 	aprint_error_dev(sc->bge_dev, "watchdog timeout -- resetting\n");
@@ -6419,7 +6419,7 @@ bge_sysctl_init(struct bge_softc *sc)
 	    CTLFLAG_READWRITE,
 	    CTLTYPE_BOOL, "trigger_reset",
 	    SYSCTL_DESCR("Trigger an interface reset"),
-	    NULL, 0, &sc->sc_triggerreset, 0, CTL_CREATE,
+	    NULL, 0, &sc->sc_trigger_reset, 0, CTL_CREATE,
 	    CTL_EOL)) != 0) {
 		goto out;
 	}

Index: src/sys/dev/pci/if_bgevar.h
diff -u src/sys/dev/pci/if_bgevar.h:1.34 src/sys/dev/pci/if_bgevar.h:1.35
--- src/sys/dev/pci/if_bgevar.h:1.34	Sun Aug 14 09:03:05 2022
+++ src/sys/dev/pci/if_bgevar.h	Fri Aug 19 07:48:43 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_bgevar.h,v 1.34 2022/08/14 09:03:05 skrll Exp $	*/
+/*	$NetBSD: if_bgevar.h,v 1.35 2022/08/19 07:48:43 skrll Exp $	*/
 /*
  * Copyright (c) 2001 Wind River Systems
  * Copyright (c) 1997, 1998, 1999, 2001
@@ -363,7 +363,7 @@ struct bge_softc {
 	struct work sc_reset_work;
 	volatile unsigned sc_reset_pending;
 
-	bool sc_triggerreset;
+	bool sc_trigger_reset;
 };
 
 #endif /* _DEV_PCI_IF_BGEVAR_H_ */