From 4c2c2a1256a8a4dda7c0ff3680aaaa6df56de72f Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 1 Jul 2021 06:42:55 +0900 Subject: [PATCH] network: use usec_add() at several more places --- src/network/networkd-ndisc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c index e2c178aad0a..1564aa0cf7d 100644 --- a/src/network/networkd-ndisc.c +++ b/src/network/networkd-ndisc.c @@ -1045,7 +1045,7 @@ static int ndisc_router_process_rdnss(Link *link, sd_ndisc_router *rt) { if (rdnss) { rdnss->marked = false; rdnss->router = router; - rdnss->valid_until = time_now + lifetime * USEC_PER_SEC; + rdnss->valid_until = usec_add(time_now, lifetime * USEC_PER_SEC); continue; } @@ -1056,7 +1056,7 @@ static int ndisc_router_process_rdnss(Link *link, sd_ndisc_router *rt) { *x = (NDiscRDNSS) { .address = a[j], .router = router, - .valid_until = time_now + lifetime * USEC_PER_SEC, + .valid_until = usec_add(time_now, lifetime * USEC_PER_SEC), }; r = set_ensure_consume(&link->ndisc_rdnss, &ndisc_rdnss_hash_ops, TAKE_PTR(x)); @@ -1143,12 +1143,12 @@ static int ndisc_router_process_dnssl(Link *link, sd_ndisc_router *rt) { if (dnssl) { dnssl->marked = false; dnssl->router = router; - dnssl->valid_until = time_now + lifetime * USEC_PER_SEC; + dnssl->valid_until = usec_add(time_now, lifetime * USEC_PER_SEC); continue; } s->router = router; - s->valid_until = time_now + lifetime * USEC_PER_SEC; + s->valid_until = usec_add(time_now, lifetime * USEC_PER_SEC); r = set_ensure_consume(&link->ndisc_dnssl, &ndisc_dnssl_hash_ops, TAKE_PTR(s)); if (r < 0) -- 2.47.3