Merge pull request #844 from poettering/clock-boottime2

tree-wide: convert bootchart and lldp code to use clock_boottime_or_m…
2015-08-03 17:58:54 +02:00
parent 6934f402cd 27ec691bfd
commit 9317cbecf8
3 changed files with 4 additions and 4 deletions
@@ -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)