diff options
| author | Tom Gundersen <teg@jklm.no> | 2015-08-03 17:58:54 +0200 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2015-08-03 17:58:54 +0200 |
| commit | 9317cbecf8b06295cd67a3db2f91a8d60788ea24 (patch) | |
| tree | 645f625be1e15c1066fda6663f633de51b96f6bd /src/libsystemd-network | |
| parent | 6934f402cded89a988e8d7f93bf0b7b4eb8f17f3 (diff) | |
| parent | 27ec691bfd4088b678aa18d0bad90be47d0357f4 (diff) | |
Merge pull request #844 from poettering/clock-boottime2
tree-wide: convert bootchart and lldp code to use clock_boottime_or_m…
Diffstat (limited to 'src/libsystemd-network')
| -rw-r--r-- | src/libsystemd-network/sd-lldp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsystemd-network/sd-lldp.c b/src/libsystemd-network/sd-lldp.c index 034163eb9e..574e04b541 100644 --- a/src/libsystemd-network/sd-lldp.c +++ b/src/libsystemd-network/sd-lldp.c @@ -392,7 +392,7 @@ static void lldp_mib_delete_objects(sd_lldp *lldp) { break; if (t <= 0) - t = now(CLOCK_BOOTTIME); + t = now(clock_boottime_or_monotonic()); if (p->until > t) break; @@ -490,7 +490,7 @@ int sd_lldp_save(sd_lldp *lldp, const char *lldp_file) { free(s); s = k; - time = now(CLOCK_BOOTTIME); + time = now(clock_boottime_or_monotonic()); /* Don't write expired packets */ if (time - p->until <= 0) |