Module Name: src
Committed By: skrll
Date: Fri Aug 19 07:52:22 UTC 2022
Modified Files:
src/sys/dev/pci: if_bge.c if_bgevar.h
Log Message:
Make bge_detaching a bool. NFC.
To generate a diff of this commit:
cvs rdiff -u -r1.379 -r1.380 src/sys/dev/pci/if_bge.c
cvs rdiff -u -r1.35 -r1.36 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.379 src/sys/dev/pci/if_bge.c:1.380
--- src/sys/dev/pci/if_bge.c:1.379 Fri Aug 19 07:48:43 2022
+++ src/sys/dev/pci/if_bge.c Fri Aug 19 07:52:22 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bge.c,v 1.379 2022/08/19 07:48:43 skrll Exp $ */
+/* $NetBSD: if_bge.c,v 1.380 2022/08/19 07:52:22 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.379 2022/08/19 07:48:43 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.380 2022/08/19 07:52:22 skrll Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -6134,7 +6134,7 @@ bge_stop_locked(struct ifnet *ifp, int d
KASSERT(mutex_owned(sc->sc_core_lock));
if (disable) {
- sc->bge_detaching = 1;
+ sc->bge_detaching = true;
callout_halt(&sc->bge_timeout, NULL);
} else
callout_stop(&sc->bge_timeout);
Index: src/sys/dev/pci/if_bgevar.h
diff -u src/sys/dev/pci/if_bgevar.h:1.35 src/sys/dev/pci/if_bgevar.h:1.36
--- src/sys/dev/pci/if_bgevar.h:1.35 Fri Aug 19 07:48:43 2022
+++ src/sys/dev/pci/if_bgevar.h Fri Aug 19 07:52:22 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bgevar.h,v 1.35 2022/08/19 07:48:43 skrll Exp $ */
+/* $NetBSD: if_bgevar.h,v 1.36 2022/08/19 07:52:22 skrll Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
* Copyright (c) 1997, 1998, 1999, 2001
@@ -350,7 +350,7 @@ struct bge_softc {
int bge_txcnt;
struct callout bge_timeout;
int bge_pending_rxintr_change;
- int bge_detaching;
+ bool bge_detaching;
SLIST_HEAD(, txdmamap_pool_entry) txdma_list;
struct txdmamap_pool_entry *txdma[BGE_TX_RING_CNT];