From 0ee3c9a14806187ae7b21c6472acef229f787eec Mon Sep 17 00:00:00 2001 From: glebius Date: Wed, 1 Dec 2004 11:56:32 +0000 Subject: Mechanically rename s/ng_timeout/ng_callout/g, s/ng_untimeout/ng_uncallout/g. This is done to keep both versions in RELENG_5 and support both APIs. Reviewed by: scottl Approved by: julian (mentor), implicitly --- sys/netgraph/ng_cisco.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sys/netgraph/ng_cisco.c') diff --git a/sys/netgraph/ng_cisco.c b/sys/netgraph/ng_cisco.c index 33f027a..0f7b7b9 100644 --- a/sys/netgraph/ng_cisco.c +++ b/sys/netgraph/ng_cisco.c @@ -222,7 +222,7 @@ cisco_newhook(node_p node, hook_p hook, const char *name) NG_HOOK_SET_PRIVATE(hook, &sc->downstream); /* Start keepalives */ - ng_timeout(&sc->handle, node, NULL, (hz * KEEPALIVE_SECS), + ng_callout(&sc->handle, node, NULL, (hz * KEEPALIVE_SECS), &cisco_keepalive, (void *)sc, 0); } else if (strcmp(name, NG_CISCO_HOOK_INET) == 0) { sc->inet.hook = hook; @@ -425,7 +425,7 @@ cisco_disconnect(hook_p hook) pep->hook = NULL; if (pep->af == 0xffff) /* If it is the downstream hook, stop the timers */ - ng_untimeout(&sc->handle, NG_HOOK_NODE(hook)); + ng_uncallout(&sc->handle, NG_HOOK_NODE(hook)); } /* If no more hooks, remove the node */ @@ -587,7 +587,7 @@ cisco_keepalive(node_p node, hook_p hook, void *arg1, int arg2) cisco_send(sc, CISCO_KEEPALIVE_REQ, sc->local_seq, sc->remote_seq); if (sc->seqRetries++ > 1) cisco_notify(sc, NGM_LINK_IS_DOWN); - ng_timeout(&sc->handle, node, NULL, (hz * KEEPALIVE_SECS), + ng_callout(&sc->handle, node, NULL, (hz * KEEPALIVE_SECS), &cisco_keepalive, (void *)sc, 0); } -- cgit v1.1