diff options
| -rw-r--r-- | sys/netgraph/netgraph.h | 2 | ||||
| -rw-r--r-- | sys/netgraph/ng_base.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/sys/netgraph/netgraph.h b/sys/netgraph/netgraph.h index 2e1802e..313eac8 100644 --- a/sys/netgraph/netgraph.h +++ b/sys/netgraph/netgraph.h @@ -1101,7 +1101,7 @@ int ng_send_fn1(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); -#define ng_callout_init(c) callout_init(c, CALLOUT_MPSAFE) +#define ng_callout_init(c) callout_init(c, NET_CALLOUT_MPSAFE) /* Flags for netgraph functions. */ #define NG_NOFLAGS 0x00000000 /* no special options */ diff --git a/sys/netgraph/ng_base.c b/sys/netgraph/ng_base.c index 27b1297..4dc58ee 100644 --- a/sys/netgraph/ng_base.c +++ b/sys/netgraph/ng_base.c @@ -3581,9 +3581,7 @@ ng_callout_trampoline(void *arg) { item_p item = arg; - NET_LOCK_GIANT(); ng_snd_item(item, 0); - NET_UNLOCK_GIANT(); } |
