D47530.diff
No OneTemporary
Actions

Size

991 B

Referenced Files

None

Subscribers

None

D47530.diff
View Options

	diff --git a/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c b/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c
	--- a/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c
	+++ b/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c
	@@ -172,18 +172,15 @@
	SPL_INT(s);

	SPL_NET(s);
	- READ_ENTER(&softc->ipf_global);

	if (softc->ipf_running > 0)
	ipf_slowtimer(softc);

	if (softc->ipf_running == -1 \|\| softc->ipf_running == 1) {
	- callout_init(&softc->ipf_slow_ch, 1);
	callout_reset(&softc->ipf_slow_ch,
	(hz / IPF_HZ_DIVIDE) * IPF_HZ_MULT,
	ipf_timer_func, softc);
	}
	- RWLOCK_EXIT(&softc->ipf_global);
	SPL_X(s);
	}

	@@ -218,7 +215,7 @@
	softc->ipf_slow_ch = timeout(ipf_timer_func, softc,
	(hz / IPF_HZ_DIVIDE) * IPF_HZ_MULT);
	#endif
	- callout_init(&softc->ipf_slow_ch, 1);
	+ callout_init_rw(&softc->ipf_slow_ch, &softc->ipf_global.ipf_lk, CALLOUT_SHAREDLOCK);
	callout_reset(&softc->ipf_slow_ch, (hz / IPF_HZ_DIVIDE) * IPF_HZ_MULT,
	ipf_timer_func, softc);
	return (0);