Changes from Dave Mills

bk: 425b54128FgANOyZy7_n2FCZVtqCWw

diff --git a/ntpd/ntp_loopfilter.c b/ntpd/ntp_loopfilter.c
index ccb40ecca842ca4a04041faab7a9f944e845d325..893070e0264f2a16f78f9d10c39843be408a4413 100644 (file)
--- a/ntpd/ntp_loopfilter.c
+++ b/ntpd/ntp_loopfilter.c
@@ -280,10 +280,9 @@ local_clock(
          * Update the jitter estimate.
          */
        etemp = SQUARE(clock_jitter);
-       dtemp = max(abs(fp_offset - last_offset),
-           LOGTOD(sys_precision));
-       clock_jitter = SQRT(etemp + (SQUARE(dtemp) - etemp) /
-           CLOCK_AVG);
+       dtemp = SQUARE(max(fabs(fp_offset - last_offset),
+           LOGTOD(sys_precision)));
+       clock_jitter = SQRT(etemp + (dtemp - etemp) / CLOCK_AVG);
 
        /*
         * The huff-n'-puff filter finds the lowest delay in the recent

diff --git a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c
index ad91ecfdb0cd03379d1a2a0afdefc4b6d4a38cc3..4adb761cd1843884b50a401e0970288383ab0887 100644 (file)
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@ -1265,7 +1265,7 @@ clock_update(void)
                sys_reftime = sys_peer->rec;
                sys_rootdelay = sys_peer->rootdelay + sys_peer->delay;
                dtemp = sys_peer->disp + clock_phi * (current_time -
-                   sys_peer->epoch) + sys_peer->jitter +
+                   sys_peer->epoch) + sys_jitter +
                    fabs(sys_peer->offset);
 #ifdef REFCLOCK
                if (!(sys_peer->flags & FLAG_REFCLOCK) && dtemp <