diff options
| author | Gleb Smirnoff <glebius@FreeBSD.org> | 2005-02-12 09:52:36 +0000 |
|---|---|---|
| committer | Gleb Smirnoff <glebius@FreeBSD.org> | 2005-02-12 09:52:36 +0000 |
| commit | 687809752d5bcdca8cc6e0eee77be1f558e2e853 (patch) | |
| tree | 185ddc303e22964a7a027edff3c8d83201749189 | |
| parent | 610b5a1fb1076cc591ceda87680d1caf69564def (diff) | |
Notes
| -rw-r--r-- | sys/netgraph/netgraph.h | 3 | ||||
| -rw-r--r-- | sys/netgraph/ng_base.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sys/netgraph/netgraph.h b/sys/netgraph/netgraph.h index 96e3dbbae4ea4..4cf32b77ceaac 100644 --- a/sys/netgraph/netgraph.h +++ b/sys/netgraph/netgraph.h @@ -1079,8 +1079,7 @@ int ng_send_fn(node_p node, hook_p hook, ng_item_fn *fn, int ng_uncallout(struct callout *c, node_p node); int ng_callout(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) +#define ng_callout_init(c) callout_init(c, CALLOUT_MPSAFE) /* * prototypes the user should DEFINITELY not use directly diff --git a/sys/netgraph/ng_base.c b/sys/netgraph/ng_base.c index 9d35414e016ac..a0ec21ea6f7b3 100644 --- a/sys/netgraph/ng_base.c +++ b/sys/netgraph/ng_base.c @@ -2973,8 +2973,8 @@ ngb_mod_event(module_t mod, int event, void *data) mtx_init(&ngq_mtx, "netgraph free item list mutex", NULL, MTX_DEF); s = splimp(); - /* XXX could use NETISR_MPSAFE but need to verify code */ - netisr_register(NETISR_NETGRAPH, (netisr_t *)ngintr, NULL, 0); + netisr_register(NETISR_NETGRAPH, (netisr_t *)ngintr, NULL, + NETISR_MPSAFE); splx(s); break; case MOD_UNLOAD: |