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/test-icmp6-rs.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/test-icmp6-rs.c')
| -rw-r--r-- | src/libsystemd-network/test-icmp6-rs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsystemd-network/test-icmp6-rs.c b/src/libsystemd-network/test-icmp6-rs.c index b81211f6b..afa856265 100644 --- a/src/libsystemd-network/test-icmp6-rs.c +++ b/src/libsystemd-network/test-icmp6-rs.c @@ -108,7 +108,7 @@ static void test_rs_done(sd_icmp6_nd *nd, int event, void *userdata) { } static void test_rs(sd_event *e) { - usec_t time_now = now(CLOCK_MONOTONIC); + usec_t time_now = now(clock_boottime_or_monotonic()); sd_icmp6_nd *nd; if (verbose) @@ -123,7 +123,7 @@ static void test_rs(sd_event *e) { assert(sd_icmp6_nd_set_mac(nd, &mac_addr) >= 0); assert(sd_icmp6_nd_set_callback(nd, test_rs_done, e) >= 0); - assert(sd_event_add_time(e, &test_hangcheck, CLOCK_MONOTONIC, + assert(sd_event_add_time(e, &test_hangcheck, clock_boottime_or_monotonic(), time_now + 2 *USEC_PER_SEC, 0, test_rs_hangcheck, NULL) >= 0); |