From e091fdc169106db4a26d45d02c2f30fe9c708556 Mon Sep 17 00:00:00 2001 From: glebius Date: Wed, 7 Jun 2006 12:42:15 +0000 Subject: When counting nodes second time, use the same criteria as for the first time. PR: kern/98529 Submitted by: Michael Heyman --- sys/netgraph/ng_base.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sys/netgraph/ng_base.c') diff --git a/sys/netgraph/ng_base.c b/sys/netgraph/ng_base.c index 4dc58ee..e1073f4 100644 --- a/sys/netgraph/ng_base.c +++ b/sys/netgraph/ng_base.c @@ -2654,15 +2654,15 @@ ng_generic_msg(node_p here, item_p item, hook_p lasthook) LIST_FOREACH(node, &ng_nodelist, nd_nodes) { struct nodeinfo *const np = &nl->nodeinfo[nl->numnames]; + if (NG_NODE_NOT_VALID(node)) + continue; + if (!unnamed && (! NG_NODE_HAS_NAME(node))) + continue; if (nl->numnames >= num) { log(LOG_ERR, "%s: number of %s changed\n", __func__, "nodes"); break; } - if (NG_NODE_NOT_VALID(node)) - continue; - if (!unnamed && (! NG_NODE_HAS_NAME(node))) - continue; if (NG_NODE_HAS_NAME(node)) strcpy(np->name, NG_NODE_NAME(node)); strcpy(np->type, node->nd_type->name); -- cgit v1.1