summaryrefslogtreecommitdiffstats
path: root/sys/netpfil/pf
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2015-05-22 17:05:21 +0000
committerjkim <jkim@FreeBSD.org>2015-05-22 17:05:21 +0000
commit318c4f97e694c1972b55450cafe914f39977d179 (patch)
tree9c598a67317c5e22e5e44d49e8bb797cb28e79b9 /sys/netpfil/pf
parentb15207d5c210e55bafbc6c85235ab64d12815e79 (diff)
downloadFreeBSD-src-318c4f97e694c1972b55450cafe914f39977d179.zip
FreeBSD-src-318c4f97e694c1972b55450cafe914f39977d179.tar.gz
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
Diffstat (limited to 'sys/netpfil/pf')
-rw-r--r--sys/netpfil/pf/if_pfsync.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c
index 3d62cf5..516a92a 100644
--- a/sys/netpfil/pf/if_pfsync.c
+++ b/sys/netpfil/pf/if_pfsync.c
@@ -324,7 +324,7 @@ pfsync_clone_create(struct if_clone *ifc, int unit, caddr_t param)
ifp->if_mtu = ETHERMTU;
mtx_init(&sc->sc_mtx, pfsyncname, NULL, MTX_DEF);
mtx_init(&sc->sc_bulk_mtx, "pfsync bulk", NULL, MTX_DEF);
- callout_init(&sc->sc_tmo, CALLOUT_MPSAFE);
+ callout_init(&sc->sc_tmo, 1);
callout_init_mtx(&sc->sc_bulk_tmo, &sc->sc_bulk_mtx, 0);
callout_init_mtx(&sc->sc_bulkfail_tmo, &sc->sc_bulk_mtx, 0);
OpenPOWER on IntegriCloud