From 8c938ed70a0b0d695f2d2c2577503b1b3b9365ec Mon Sep 17 00:00:00 2001 From: julian Date: Tue, 20 Jul 2004 17:15:38 +0000 Subject: Slight cosmetic changes. Also introduce a macro to be called by persistent nodes to signal their persistence during shutdown to hide this mechanism from the node author. Make node flags have a consistent style in naming. Document the change. --- sys/dev/cp/if_cp.c | 4 ++-- sys/dev/ctau/if_ct.c | 4 ++-- sys/dev/cx/if_cx.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'sys/dev') diff --git a/sys/dev/cp/if_cp.c b/sys/dev/cp/if_cp.c index 728df80..c74224a 100644 --- a/sys/dev/cp/if_cp.c +++ b/sys/dev/cp/if_cp.c @@ -2328,11 +2328,11 @@ static int ng_cp_rmnode (node_p node) splx (s); } #ifdef KLD_MODULE - if (node->nd_flags & NG_REALLY_DIE) { + if (node->nd_flags & NGF_REALLY_DIE) { NG_NODE_SET_PRIVATE (node, NULL); NG_NODE_UNREF (node); } - node->nd_flags &= ~NG_INVALID; + NG_NODE_REVIVE(node); /* Persistant node */ #endif #else /* __FreeBSD_version < 500000 */ drv_t *d = node->private; diff --git a/sys/dev/ctau/if_ct.c b/sys/dev/ctau/if_ct.c index 67eb83a..96b324c 100644 --- a/sys/dev/ctau/if_ct.c +++ b/sys/dev/ctau/if_ct.c @@ -2256,11 +2256,11 @@ static int ng_ct_rmnode (node_p node) splx (s); } #ifdef KLD_MODULE - if (node->nd_flags & NG_REALLY_DIE) { + if (node->nd_flags & NGF_REALLY_DIE) { NG_NODE_SET_PRIVATE (node, NULL); NG_NODE_UNREF (node); } - node->nd_flags &= ~NG_INVALID; + NG_NODE_REVIVE(node); /* Persistant node */ #endif #else /* __FreeBSD_version < 500000 */ drv_t *d = node->private; diff --git a/sys/dev/cx/if_cx.c b/sys/dev/cx/if_cx.c index 638e947..944ce65 100644 --- a/sys/dev/cx/if_cx.c +++ b/sys/dev/cx/if_cx.c @@ -2716,11 +2716,11 @@ static int ng_cx_rmnode (node_p node) splx (s); } #ifdef KLD_MODULE - if (node->nd_flags & NG_REALLY_DIE) { + if (node->nd_flags & NGF_REALLY_DIE) { NG_NODE_SET_PRIVATE (node, NULL); NG_NODE_UNREF (node); } - node->nd_flags &= ~NG_INVALID; + NG_NODE_REVIVE(node); /* Persistant node */ #endif #else /* __FreeBSD_version < 500000 */ drv_t *d = node->private; -- cgit v1.1