diff options
author | Jung-uk Kim <jkim@FreeBSD.org> | 2015-05-22 17:05:21 +0000 |
---|---|---|
committer | Jung-uk Kim <jkim@FreeBSD.org> | 2015-05-22 17:05:21 +0000 |
commit | fd90e2ed54a69bb07d14dcd4e805431ccb7d6cb6 (patch) | |
tree | 9c598a67317c5e22e5e44d49e8bb797cb28e79b9 /sys/netgraph | |
parent | 316f4c880a15660086e5c9e7ee31f8b717e855f1 (diff) | |
download | src-fd90e2ed54a69bb07d14dcd4e805431ccb7d6cb6.tar.gz src-fd90e2ed54a69bb07d14dcd4e805431ccb7d6cb6.zip |
CALLOUT_MPSAFE has lost its meaning since r141428, i.e., for more than ten
years for head. However, it is continuously misused as the mpsafe argument
for callout_init(9). Deprecate the flag and clean up callout_init() calls
to make them more consistent.
Differential Revision: https://reviews.freebsd.org/D2613
Reviewed by: jhb
MFC after: 2 weeks
Notes
Notes:
svn path=/head/; revision=283291
Diffstat (limited to 'sys/netgraph')
-rw-r--r-- | sys/netgraph/netflow/ng_netflow.c | 2 | ||||
-rw-r--r-- | sys/netgraph/netgraph.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/netgraph/netflow/ng_netflow.c b/sys/netgraph/netflow/ng_netflow.c index 7b23e6187d09..b5a82a418022 100644 --- a/sys/netgraph/netflow/ng_netflow.c +++ b/sys/netgraph/netflow/ng_netflow.c @@ -259,7 +259,7 @@ ng_netflow_constructor(node_p node) priv->ifaces[i].info.conf = NG_NETFLOW_CONF_INGRESS; /* Initialize callout handle */ - callout_init(&priv->exp_callout, CALLOUT_MPSAFE); + callout_init(&priv->exp_callout, 1); /* Allocate memory and set up flow cache */ ng_netflow_cache_init(priv); diff --git a/sys/netgraph/netgraph.h b/sys/netgraph/netgraph.h index dc008f446df0..9fc8986b2cdb 100644 --- a/sys/netgraph/netgraph.h +++ b/sys/netgraph/netgraph.h @@ -1161,7 +1161,7 @@ int ng_send_fn2(node_p node, hook_p hook, item_p pitem, ng_item_fn2 *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, 1) /* Flags for netgraph functions. */ #define NG_NOFLAGS 0x00000000 /* no special options */ |