[Bug 3053] ntp_loopfilter.c frequency calc precedence error. Sarah White.

bk: 57dbaca0EMMjccOxmTaIB_eoWeYw4A

diff --git a/ChangeLog b/ChangeLog
index f4791a0d79193a891f9da3b00da7b7d19905f245..9f35c57afc780229afffed364c105ed190b38f18 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 ---
 
+* [Bug 3053] ntp_loopfilter.c frequency calc precedence error.  Sarah White.
 * git author attribution cleanup
 * bk ignore file cleanup
 

diff --git a/ntpd/ntp_loopfilter.c b/ntpd/ntp_loopfilter.c
index 4b38aa8fd7d477fd535ac85dfde8c5db87d385a2..c8320c480196f0363229e85ec0c3514c8ebb53fa 100644 (file)
--- a/ntpd/ntp_loopfilter.c
+++ b/ntpd/ntp_loopfilter.c
@@ -701,9 +701,10 @@ local_clock(
                                 * where the FLL becomes effective.
                                 */
                                if (sys_poll >= allan_xpt)
-                                       clock_frequency += (fp_offset -
-                                           clock_offset) / max(ULOGTOD(sys_poll),
-                                           mu) * CLOCK_FLL;
+                                       clock_frequency +=
+                                             (fp_offset - clock_offset)
+                                           / ( max(ULOGTOD(sys_poll), mu)
+                                              * CLOCK_FLL);
 
                                /*
                                 * The PLL frequency gain (numerator) depends on
@@ -713,8 +714,8 @@ local_clock(
                                 */
                                etemp = min(ULOGTOD(allan_xpt), mu);
                                dtemp = 4 * CLOCK_PLL * ULOGTOD(sys_poll);
-                               clock_frequency += fp_offset * etemp / (dtemp *
-                                   dtemp);
+                               clock_frequency +=
+                                   fp_offset * etemp / (dtemp * dtemp);
                        }
                        rstclock(EVNT_SYNC, fp_offset);
                        if (fabs(fp_offset) < CLOCK_FLOOR)