More initial convergence improvements from Dave Mills

bk: 4c9841f6hHWbeWDI7LVgTK_BqdVhGw

diff --git a/ChangeLog b/ChangeLog
index 68b4716671fab4aa528bc4da066ba977652fc931..f04e20e6c58d07d6c17fa9a1ac2332af4d42cb43 100644 (file)
--- 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 ab0971ae7a732a2192881c5aa9e6006a3044a41d..41c61da530b42637768d0a4e4ba94386b5108c4c 100644 (file)
--- 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 */