[Bug 3053] Frequency prediction algorithm precedence error.

bk: 68f1f1d96VDp3C0Zoawg-8tR1xkw0g

diff --git a/ChangeLog b/ChangeLog
index df15157be0458a4de3336d5caf96f17cde40d9eb..07d0753a935e13c9c84f2b68e60f46e3582960fd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 ---
 * [Bug 3960] Remove duplicate ntp.conf.def content, reported by
              Ulrich Windl. <stenn@ntp.org>
+* [Bug 3053] Frequency prediction algorithm precedence error. <hart@ntp.org>
 * Makefile.am: Another tweak to check-local.  <stenn@ntp.org>
 * cleanup github-specific files.  <stenn@ntp.org>
 * Add COPYRIGHT.md and LICENSE.md.  <stenn@ntp.org>

diff --git a/ntpd/ntp_loopfilter.c b/ntpd/ntp_loopfilter.c
index 6378e0d7e66982c286f61797e650dfa2ea41b8b8..2088a1898568ba3fe3f0e876f0faf36b0860bdbe 100644 (file)
--- a/ntpd/ntp_loopfilter.c
+++ b/ntpd/ntp_loopfilter.c
@@ -705,12 +705,12 @@ local_clock(
                                 * becomes ineffective above the Allan intercept
                                 * where the FLL becomes effective.
                                 */
-                               if (sys_poll >= allan_xpt)
+                               if (sys_poll >= allan_xpt) {
                                        clock_frequency +=
                                              (fp_offset - clock_offset)
-                                           / ( max(ULOGTOD(sys_poll), mu)
-                                              * CLOCK_FLL);
-
+                                             / max(ULOGTOD(sys_poll), mu)
+                                             * CLOCK_FLL;
+                               }
                                /*
                                 * The PLL frequency gain (numerator) depends on
                                 * the minimum of the update interval and Allan