summaryrefslogtreecommitdiffstats
path: root/sys/netgraph/ng_cisco.c
diff options
context:
space:
mode:
authorglebius <glebius@FreeBSD.org>2004-12-01 11:56:32 +0000
committerglebius <glebius@FreeBSD.org>2004-12-01 11:56:32 +0000
commit0ee3c9a14806187ae7b21c6472acef229f787eec (patch)
tree993048ef397a314598d7acf4cda3afeaf0b93717 /sys/netgraph/ng_cisco.c
parent5951763807c9b6250b4836e194dfec959d4b5be6 (diff)
downloadFreeBSD-src-0ee3c9a14806187ae7b21c6472acef229f787eec.zip
FreeBSD-src-0ee3c9a14806187ae7b21c6472acef229f787eec.tar.gz
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
Diffstat (limited to 'sys/netgraph/ng_cisco.c')
-rw-r--r--sys/netgraph/ng_cisco.c6
1 files changed, 3 insertions, 3 deletions
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);
}
OpenPOWER on IntegriCloud