Simple conversion of timeout_add(X, Y * hz) to timeout_add_sec(X, Y) and timeout_add(X, tvtohz(&tv)) to timeout_add_tv(X, &tv).
OK? -- :wq Claudio Index: net/pf.c =================================================================== RCS file: /cvs/src/sys/net/pf.c,v retrieving revision 1.1079 diff -u -p -r1.1079 pf.c --- net/pf.c 10 Dec 2018 16:48:15 -0000 1.1079 +++ net/pf.c 16 Dec 2018 15:29:20 -0000 @@ -1279,7 +1279,7 @@ pf_purge(void *xnloops) NET_UNLOCK(); KERNEL_UNLOCK(); - timeout_add(&pf_purge_to, 1 * hz); + timeout_add_sec(&pf_purge_to, 1); } int32_t Index: net/pf_ioctl.c =================================================================== RCS file: /cvs/src/sys/net/pf_ioctl.c,v retrieving revision 1.339 diff -u -p -r1.339 pf_ioctl.c --- net/pf_ioctl.c 10 Dec 2018 16:48:15 -0000 1.339 +++ net/pf_ioctl.c 16 Dec 2018 15:29:01 -0000 @@ -1037,7 +1037,7 @@ pfioctl(dev_t dev, u_long cmd, caddr_t a pf_status.stateid = time_second; pf_status.stateid = pf_status.stateid << 32; } - timeout_add(&pf_purge_to, 1 * hz); + timeout_add_sec(&pf_purge_to, 1); pf_create_queues(); DPFPRINTF(LOG_NOTICE, "pf: started"); } Index: netinet/ip_carp.c =================================================================== RCS file: /cvs/src/sys/netinet/ip_carp.c,v retrieving revision 1.335 diff -u -p -r1.335 ip_carp.c --- netinet/ip_carp.c 4 Dec 2018 12:39:54 -0000 1.335 +++ netinet/ip_carp.c 16 Dec 2018 15:25:25 -0000 @@ -1255,7 +1255,7 @@ carp_send_ad(struct carp_vhost_entry *vh retry_later: sc->cur_vhe = NULL; if (advbase != 255 || advskew != 255) - timeout_add(&vhe->ad_tmo, tvtohz(&tv)); + timeout_add_tv(&vhe->ad_tmo, &tv); } /* @@ -1613,18 +1613,18 @@ carp_setrun(struct carp_vhost_entry *vhe sc->sc_delayed_arp = -1; switch (af) { case AF_INET: - timeout_add(&vhe->md_tmo, tvtohz(&tv)); + timeout_add_tv(&vhe->md_tmo, &tv); break; #ifdef INET6 case AF_INET6: - timeout_add(&vhe->md6_tmo, tvtohz(&tv)); + timeout_add_tv(&vhe->md6_tmo, &tv); break; #endif /* INET6 */ default: if (sc->sc_naddrs) - timeout_add(&vhe->md_tmo, tvtohz(&tv)); + timeout_add_tv(&vhe->md_tmo, &tv); if (sc->sc_naddrs6) - timeout_add(&vhe->md6_tmo, tvtohz(&tv)); + timeout_add_tv(&vhe->md6_tmo, &tv); break; } break; @@ -1634,7 +1634,7 @@ carp_setrun(struct carp_vhost_entry *vhe tv.tv_usec = 1 * 1000000 / 256; else tv.tv_usec = vhe->advskew * 1000000 / 256; - timeout_add(&vhe->ad_tmo, tvtohz(&tv)); + timeout_add_tv(&vhe->ad_tmo, &tv); break; } }