From: Dave Hart <hart@ntp.org>
Date: Tue, 24 May 2011 05:27:19 +0000 (+0000)
Subject: Remove hardcoded 1/960 s. fudge for <CR> transmission time at 9600 8n1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=da6cc47befe27332216e8ffc844cd77718bf9b32;p=thirdparty%2Fntp.git

Remove hardcoded 1/960 s. fudge for <CR> transmission time at 9600 8n1
  from WWVB/Spectracom driver introduced in 4.2.7p169.

bk: 4ddb41b7LCuexebxJsL5tbqdQjrZ2A
---

diff --git a/ChangeLog b/ChangeLog
index eb4b755b4e..3672122e46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+* Remove hardcoded 1/960 s. fudge for <CR> transmission time at 9600 8n1
+  from WWVB/Spectracom driver introduced in 4.2.7p169.
 (4.2.7p171) 2011/05/23 Released by Harlan Stenn <stenn@ntp.org>
 * Eliminate warnings about shadowing global "basename" on Linux.
 * Use filegen_config() consistently when changing filegen options.
diff --git a/ntpd/refclock_wwvb.c b/ntpd/refclock_wwvb.c
index c65726dc8f..f2856b0303 100644
--- a/ntpd/refclock_wwvb.c
+++ b/ntpd/refclock_wwvb.c
@@ -249,7 +249,6 @@ wwvb_receive(
 	struct recvbuf *rbufp
 	)
 {
-	const l_fp one_char_time = { { 0 }, { (u_int32)(FRAC / 960) } };
 	struct wwvbunit *up;
 	struct refclockproc *pp;
 	struct peer *peer;
@@ -313,12 +312,6 @@ wwvb_receive(
 	if (L_ISZERO(&pp->lastrec))
 		return;
 
-	/*
-	 * The start of the <CR> is the on-time event, while our
-	 * timestamp reflects the end of that <CR> at best. Adjust.
-	 */
-	L_SUB(&pp->lastrec, &one_char_time);
-
 	/*
 	 * We get down to business, check the timecode format and decode
 	 * its contents. This code uses the timecode length to determine