From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 21 Sep 2010 05:26:14 +0000 (-0400)
Subject: More initial convergence improvements from Dave Mills
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fbfbe84dc5eba1a2bb06b2e4fe87b925bdf8adab;p=thirdparty%2Fntp.git

More initial convergence improvements from Dave Mills

bk: 4c9841f6hHWbeWDI7LVgTK_BqdVhGw
---

diff --git a/ChangeLog b/ChangeLog
index 68b4716671..f04e20e6c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* More Initial convergence improvements from Dave Mills.
 * Documentation updates from Dave Mills.
 * [Bug 1635] from 4.2.6p3-RC2: "filegen ... enable" is not default.
 (4.2.7p53) 2010/09/20 Released by Harlan Stenn <stenn@ntp.org>
diff --git a/ntpd/ntp_loopfilter.c b/ntpd/ntp_loopfilter.c
index ab0971ae7a..41c61da530 100644
--- a/ntpd/ntp_loopfilter.c
+++ b/ntpd/ntp_loopfilter.c
@@ -998,7 +998,10 @@ loop_config(
 		break;
 
 	case LOOP_MINSTEP:	/* stepout threshold (stepout) */
-		clock_minstep = freq; 
+		if (freq < CLOCK_MINSTEP)
+			clock_minstep = CLOCK_MINSTEP;
+		else
+			clock_minstep = freq; 
 		break;
 
 	case LOOP_LEAP:		/* not used */