diff options
| author | glebius <glebius@FreeBSD.org> | 2004-11-02 21:24:30 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2004-11-02 21:24:30 +0000 |
| commit | a033067901d630caa7ecc38fcf8a0d416a4b6d3d (patch) | |
| tree | a65f34c1266b3b9307271ab695db1b77e0055c9e /sys/netgraph/netgraph.h | |
| parent | 8b6661b126d65e1e6be9c505085ca230e7f42f01 (diff) | |
| download | FreeBSD-src-a033067901d630caa7ecc38fcf8a0d416a4b6d3d.zip FreeBSD-src-a033067901d630caa7ecc38fcf8a0d416a4b6d3d.tar.gz | |
- Make ng_timeout() to use callout() interface instead of timeout().
- Remove callout-hacking from ng_untimeout().
Approved by: julian (mentor)
MFC after: 1 month
Diffstat (limited to 'sys/netgraph/netgraph.h')
| -rw-r--r-- | sys/netgraph/netgraph.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/netgraph/netgraph.h b/sys/netgraph/netgraph.h index 8ef9aa6..8b79ded 100644 --- a/sys/netgraph/netgraph.h +++ b/sys/netgraph/netgraph.h @@ -1074,10 +1074,11 @@ int ng_rmtype(struct ng_type *tp); int ng_snd_item(item_p item, int queue); int ng_send_fn(node_p node, hook_p hook, ng_item_fn *fn, void *arg1, int arg2); -int ng_untimeout(struct callout_handle handle, node_p node); -struct callout_handle - ng_timeout(node_p node, hook_p hook, int ticks, +int ng_untimeout(struct callout *c, node_p node); +int ng_timeout(struct callout *c, node_p node, hook_p hook, int ticks, ng_item_fn *fn, void * arg1, int arg2); +/* We should mark callout mpsafe as soon as we mark netgraph ISR mpsafe */ +#define ng_callout_init(c) callout_init(c, 0) /* * prototypes the user should DEFINITELY not use directly |
