From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 27 Dec 2006 06:57:20 +0000 (-0500)
Subject: [Bug 452] Do not report kernel PLL/FLL flips.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e36d5a35863ed325bb4e90409a34071a0abd0b2;p=thirdparty%2Fntp.git

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

bk: 459219504-l6HfA1aCEArCc-JRnTHA
---

diff --git a/NEWS b/NEWS
index d319ca0ce2..21c12e1f21 100644
--- 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 b12fccee1e..a103d3aeca 100644
--- 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;