diff options
| author | avg <avg@FreeBSD.org> | 2017-03-04 13:03:31 +0000 |
|---|---|---|
| committer | avg <avg@FreeBSD.org> | 2017-03-04 13:03:31 +0000 |
| commit | ee895f7b426627aad1638091f62f0eb122a17460 (patch) | |
| tree | 822fb78084d564fa54c140dfab630370fb3397e6 /sys/contrib | |
| parent | a3480d5c9e3eb277d85d4bef6f03fd62eb864799 (diff) | |
| download | FreeBSD-src-ee895f7b426627aad1638091f62f0eb122a17460.zip FreeBSD-src-ee895f7b426627aad1638091f62f0eb122a17460.tar.gz | |
MFC r283291: don't use CALLOUT_MPSAFE with callout_init()
The main purpose of this MFC is to reduce conflicts for other merges.
Parts of the original change have already "trickled down" via individual MFCs.
Diffstat (limited to 'sys/contrib')
| -rw-r--r-- | sys/contrib/ipfilter/netinet/ip_fil_freebsd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c b/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c index 6754ef3..02fe7eb 100644 --- a/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c +++ b/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c @@ -190,7 +190,7 @@ ipf_timer_func(arg) #if 0 softc->ipf_slow_ch = timeout(ipf_timer_func, softc, hz/2); #endif - callout_init(&softc->ipf_slow_ch, CALLOUT_MPSAFE); + callout_init(&softc->ipf_slow_ch, 1); callout_reset(&softc->ipf_slow_ch, (hz / IPF_HZ_DIVIDE) * IPF_HZ_MULT, ipf_timer_func, softc); @@ -238,7 +238,7 @@ ipfattach(softc) softc->ipf_slow_ch = timeout(ipf_timer_func, softc, (hz / IPF_HZ_DIVIDE) * IPF_HZ_MULT); #endif - callout_init(&softc->ipf_slow_ch, CALLOUT_MPSAFE); + callout_init(&softc->ipf_slow_ch, 1); callout_reset(&softc->ipf_slow_ch, (hz / IPF_HZ_DIVIDE) * IPF_HZ_MULT, ipf_timer_func, softc); return 0; |
