[Bug 2322] Oncore driver should send 0 PPS offset to GPS

bk: 51efa271dnqRF6sKbEaFB4EatCL-jg

diff --git a/ChangeLog b/ChangeLog
index aec1f3efb081d6ade3e6843e3465dca5515a0f5e..47b811c5ba1d3e3fe908a16424b54910dc34c127 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 2322] Oncore driver should send 0 PPS offset to GPS.
 (4.2.7p375) 2013/07/22 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 883] log warning arguments swapped in refclock_gpsvme.c.
 * [Bug 2368] Correct bug in previous attempt.

diff --git a/ntpd/refclock_oncore.c b/ntpd/refclock_oncore.c
index 8e63c03549eb5f42e3e027df0aff263e273a8345..91839c7d1e99339d5f923220195ad02d47a96d24 100644 (file)
--- a/ntpd/refclock_oncore.c
+++ b/ntpd/refclock_oncore.c
@@ -3050,11 +3050,9 @@ oncore_msg_Cj_init(
                oncore_sendmsg(instance, Cmd,  sizeof(oncore_cmd_Az));  /* 6,8,12 */
 
                        /* PPS offset in ns */
-               if (instance->offset) {
-                       memcpy(Cmd, oncore_cmd_Ay, (size_t) sizeof(oncore_cmd_Ay));     /* some have it, some don't */
-                       w32_buf(&Cmd[-2+4], instance->offset);                  /* will check for hw response */
-                       oncore_sendmsg(instance, Cmd,  sizeof(oncore_cmd_Ay));
-               }
+               memcpy(Cmd, oncore_cmd_Ay, (size_t) sizeof(oncore_cmd_Ay));     /* some have it, some don't */
+               w32_buf(&Cmd[-2+4], instance->offset);                  /* will check for hw response */
+               oncore_sendmsg(instance, Cmd,  sizeof(oncore_cmd_Ay));
 
                /* Satellite mask angle */