From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 24 Feb 2007 10:16:26 +0000 (-0500)
Subject: Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
X-Git-Tag: NTP_4_2_5P12~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6b34912ab48436c9501e3d0ddf6b5a0c310a8a6;p=thirdparty%2Fntp.git

Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
into  whimsy.udel.edu:/deacon/backroom/ntp-dev

bk: 45e0107aC7yGhski5u8j4gLRuQTYyA
---

f6b34912ab48436c9501e3d0ddf6b5a0c310a8a6
diff --cc ntpd/ntp_loopfilter.c
index 0d1cf6e36,d0fa466c9..56b9e1cf8
--- a/ntpd/ntp_loopfilter.c
+++ b/ntpd/ntp_loopfilter.c
@@@ -975,9 -968,9 +970,9 @@@ loop_config
  		 * is zero to cancel any previous nonsense. If you don't
  		 * want this initialization, remove the ntp.drift file.
  		 */
 -		if (pll_control && kern_enable) {
 +		if (pll_control && kern_enable && clock_max > 0) {
  			memset((char *)&ntv, 0, sizeof(ntv));
- 			ntv.modes = MOD_FREQUENCY;
+ 			ntv.modes = MOD_OFFSET | MOD_FREQUENCY;
  			ntv.freq = (int32)(drift_comp * 65536e6);
  			ntp_adjtime(&ntv);
  		}