[Bug 452] Do not report kernel PLL/FLL flips.

bk: 459219504-l6HfA1aCEArCc-JRnTHA

diff --git a/NEWS b/NEWS
index d319ca0ce2a96098a1edeedd7a2ed7c4ab904d24..21c12e1f21cea22d2ada825bb1c39f53e2057a97 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+* [Bug 452] Do not report kernel PLL/FLL flips.
 * [Bug 746] Expert mouseCLOCK USB v2.0 support added.'
 * driver8.html updates.
 * [Bug 747] Drop <NOBR> tags from ntpdc.html.

diff --git a/ntpd/ntp_loopfilter.c b/ntpd/ntp_loopfilter.c
index b12fccee1ea86b29e18027d0136b28cb8b391a6e..a103d3aecaac861c5fafa7d6655ec0232b4fe0d9 100644 (file)
--- a/ntpd/ntp_loopfilter.c
+++ b/ntpd/ntp_loopfilter.c
@@ -650,17 +650,15 @@ local_clock(
                 * frequency and pretend we did it here.
                 */
                if (ntp_adjtime(&ntv) == TIME_ERROR) {
-                       if (ntv.status != pll_status)
-                               NLOG(NLOG_SYNCEVENT | NLOG_SYSEVENT)
-                                   msyslog(LOG_NOTICE,
-                                   "kernel time sync disabled %04x",
-                                   ntv.status);
+                       NLOG(NLOG_SYNCEVENT | NLOG_SYSEVENT)
+                           msyslog(LOG_NOTICE,
+                           "kernel time sync error %04x", ntv.status);
                        ntv.status &= ~(STA_PPSFREQ | STA_PPSTIME);
                } else {
-                       if (ntv.status != pll_status)
+                       if ((ntv.status ^ pll_status) & ~STA_FLL)
                                NLOG(NLOG_SYNCEVENT | NLOG_SYSEVENT)
                                    msyslog(LOG_NOTICE,
-                                   "kernel time sync enabled %04x",
+                                   "kernel time sync status change %04x",
                                    ntv.status);
                }
                pll_status = ntv.status;