WWVB refclock cleanup from Dave Mills

bk: 49f04630WgEC18ynAuEEgcjKioRVZg

diff --git a/ChangeLog b/ChangeLog
index dea51159aa554f0e4702b506d45c83fb4804af4a..bb4ee8b2b7b7256309ac1c4aa4223f22e3eebcff 100644 (file)
--- 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 ae15c39d9b1db0884c994cddac8744fd70a6b7dc..e8474ac509aaa4eb6d985a2251f42d7a1481e5bb 100644 (file)
--- 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);