From: Danny Mayer <mayer@ntp.org>
Date: Wed, 27 Sep 2006 02:17:09 +0000 (-0400)
Subject: Unchanged
X-Git-Tag: NTP_4_2_3P52~5^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b07461f3677627117b62d2b2d389f6ceca9aefa;p=thirdparty%2Fntp.git

Unchanged

bk: 4519df25wVUH62Tv8psG_gfFXbTnCw
---

diff --git a/ntpd/refclock_wwv.c b/ntpd/refclock_wwv.c
index cfc94b1b4..3477ed57b 100644
--- a/ntpd/refclock_wwv.c
+++ b/ntpd/refclock_wwv.c
@@ -1459,17 +1459,14 @@ wwv_endpoc(
 	 * If the epoch candidate is the same as the last one, increment
 	 * the run counter. If not, save the length, epoch and end
 	 * time of the current run for use later and reset the counter.
-	 * The epoch is considered valid if the run is at least SCMP
-	 * (10) s, the minute is synchronized and the interval since the
-	 * last epoch  is not greater than the averaging interval. Thus,
-	 * after a long absence, the program will wait a full averaging
-	 * interval while the integrator charges up.
+	 * If the run is at least SCMP (10) s, the SSYNC bit is lit and
+	 * the epoch considered valid for synchronization.
 	 */
 	tmp2 = (tepoch - xepoch) % SECOND;
 	if (tmp2 == 0) {
 		syncnt++;
-		if (syncnt > SCMP && up->status & MSYNC && (up->status &
-		    FGATE || scount - zcount <= up->avgint)) {
+		if (syncnt > SCMP && up->status & MSYNC && up->status &
+		    FGATE) {
 			up->status |= SSYNC;
 			up->yepoch = tepoch;
 		}