Attachment #254917 for bug #282478




#if 0
		softc->ipf_slow_ch = timeout(ipf_timer_func, softc, hz/2);
#endif
		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);

	softc->ipf_slow_ch = timeout(ipf_timer_func, softc,
				     (hz / IPF_HZ_DIVIDE) * IPF_HZ_MULT);
#endif
	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);
}

- 

Return to bug 282478

Lines 181-187 ipf_timer_func(void *arg) Link Here

(-)b/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c (-3 / +3 lines)
181	#if 0	181	#if 0
182	softc->ipf_slow_ch = timeout(ipf_timer_func, softc, hz/2);	182	softc->ipf_slow_ch = timeout(ipf_timer_func, softc, hz/2);
183	#endif	183	#endif
184	callout_init(&softc->ipf_slow_ch, 1);	184	callout_init_rw(&softc->ipf_slow_ch, &softc->ipf_global.ipf_lk, CALLOUT_SHAREDLOCK);
185	callout_reset(&softc->ipf_slow_ch,	185	callout_reset(&softc->ipf_slow_ch,
186	(hz / IPF_HZ_DIVIDE) * IPF_HZ_MULT,	186	(hz / IPF_HZ_DIVIDE) * IPF_HZ_MULT,
187	ipf_timer_func, softc);	187	ipf_timer_func, softc);
Lines 221-229 ipfattach(ipf_main_softc_t *softc) Link Here
221	softc->ipf_slow_ch = timeout(ipf_timer_func, softc,	221	softc->ipf_slow_ch = timeout(ipf_timer_func, softc,
222	(hz / IPF_HZ_DIVIDE) * IPF_HZ_MULT);	222	(hz / IPF_HZ_DIVIDE) * IPF_HZ_MULT);
223	#endif	223	#endif
224	callout_init(&softc->ipf_slow_ch, 1);	224	callout_init_rw(&softc->ipf_slow_ch, &softc->ipf_global.ipf_lk, CALLOUT_SHAREDLOCK);
225	callout_reset(&softc->ipf_slow_ch, (hz / IPF_HZ_DIVIDE) * IPF_HZ_MULT,	225	callout_reset(&softc->ipf_slow_ch, (hz / IPF_HZ_DIVIDE) * IPF_HZ_MULT,
226	ipf_timer_func, softc);	226	ipf_timer_func, softc);
		227
227	return (0);	228	return (0);
228	}	229	}
229		230
230	-