From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 23 Apr 2009 10:42:56 +0000 (-0400)
Subject: WWVB refclock cleanup from Dave Mills
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16c594d763792ac815fbe20fa2c3a854e68b8331;p=thirdparty%2Fntp.git

WWVB refclock cleanup from Dave Mills

bk: 49f04630WgEC18ynAuEEgcjKioRVZg
---

diff --git a/ChangeLog b/ChangeLog
index dea51159aa..bb4ee8b2b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* WWVB refclock cleanup from Dave Mills.
 * Code cleanup: requested_key -> request_key.
 * [Bug 833] ignore whitespace at end of remote configuration lines
 * [Bug 1033] ntpdc/ntpq crash prompting for keyid on Windows
diff --git a/ntpd/refclock_wwvb.c b/ntpd/refclock_wwvb.c
index ae15c39d9b..e8474ac509 100644
--- a/ntpd/refclock_wwvb.c
+++ b/ntpd/refclock_wwvb.c
@@ -398,10 +398,10 @@ wwvb_receive(
 	 * timecode timestamp, but only if the PPS is not in control.
 	 */
 #ifdef HAVE_PPSAPI
-	if (peer->flags & FLAG_PPS) {
-		up->tcount++;
+	up->tcount++;
+	if (peer->flags & FLAG_PPS)
 		return;
-	}
+
 #endif /* HAVE_PPSAPI */
 	if (!refclock_process(pp))
 		refclock_report(peer, CEVNT_BADTIME);