diff options
| author | Tom Gundersen <teg@jklm.no> | 2014-07-24 18:53:01 +0200 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2014-07-24 19:02:58 +0200 |
| commit | fa94c34b083b5b4019975624453e53d0cbad2a5d (patch) | |
| tree | 8bd0d0486f7b9f3b0c36e9075bc3999ec7b28c09 /src/libsystemd-network/sd-icmp6-nd.c | |
| parent | 77ff2de999b7ea6b1b4a3a218fbd9d62bb07cd54 (diff) | |
libsystemd-network: use CLOCK_BOOTTIME instead of CLOCK_MONOTONIC where possible
The timeouts in the networking library (DHCP lease timeouts and similar) should not be affected
by suspend. In the cases where CLOCK_BOOTTIME is not implemented, it is still safe to fallback to
CLOCK_MONOTONIC, as the consumers of the library (i.e., networkd) _should_ renew the leases when
coming out of suspend.
Diffstat (limited to 'src/libsystemd-network/sd-icmp6-nd.c')
| -rw-r--r-- | src/libsystemd-network/sd-icmp6-nd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libsystemd-network/sd-icmp6-nd.c b/src/libsystemd-network/sd-icmp6-nd.c index 80915c34d6..b264e793ee 100644 --- a/src/libsystemd-network/sd-icmp6-nd.c +++ b/src/libsystemd-network/sd-icmp6-nd.c @@ -255,7 +255,7 @@ static int icmp6_router_solicitation_timeout(sd_event_source *s, uint64_t usec, nd->nd_sent++; - r = sd_event_now(nd->event, CLOCK_MONOTONIC, &time_now); + r = sd_event_now(nd->event, clock_boottime_or_monotonic(), &time_now); if (r < 0) { icmp6_nd_notify(nd, r); return 0; @@ -263,7 +263,7 @@ static int icmp6_router_solicitation_timeout(sd_event_source *s, uint64_t usec, next_timeout = time_now + ICMP6_ROUTER_SOLICITATION_INTERVAL; - r = sd_event_add_time(nd->event, &nd->timeout, CLOCK_MONOTONIC, + r = sd_event_add_time(nd->event, &nd->timeout, clock_boottime_or_monotonic(), next_timeout, 0, icmp6_router_solicitation_timeout, nd); if (r < 0) { @@ -322,7 +322,7 @@ int sd_icmp6_router_solicitation_start(sd_icmp6_nd *nd) { if (r < 0) goto error; - r = sd_event_add_time(nd->event, &nd->timeout, CLOCK_MONOTONIC, + r = sd_event_add_time(nd->event, &nd->timeout, clock_boottime_or_monotonic(), 0, 0, icmp6_router_solicitation_timeout, nd); if (r < 0) goto error; |