Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pci softc member naming consistency with wm(4). (Tay...



details:   https://anonhg.NetBSD.org/src/rev/aad392e38f3d
branches:  trunk
changeset: 369459:aad392e38f3d
user:      skrll <skrll%NetBSD.org@localhost>
date:      Fri Aug 19 07:48:43 2022 +0000

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

diffstat:

 sys/dev/pci/if_bge.c    |  8 ++++----
 sys/dev/pci/if_bgevar.h |  4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r 736e21907962 -r aad392e38f3d sys/dev/pci/if_bge.c
--- a/sys/dev/pci/if_bge.c      Fri Aug 19 07:45:50 2022 +0000
+++ b/sys/dev/pci/if_bge.c      Fri Aug 19 07:48:43 2022 +0000
@@ -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 @@
 
        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 @@
            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;
        }
diff -r 736e21907962 -r aad392e38f3d sys/dev/pci/if_bgevar.h
--- a/sys/dev/pci/if_bgevar.h   Fri Aug 19 07:45:50 2022 +0000
+++ b/sys/dev/pci/if_bgevar.h   Fri Aug 19 07:48:43 2022 +0000
@@ -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 work sc_reset_work;
        volatile unsigned sc_reset_pending;
 
-       bool sc_triggerreset;
+       bool sc_trigger_reset;
 };
 
 #endif /* _DEV_PCI_IF_BGEVAR_H_ */



Home | Main Index | Thread Index | Old Index