From f9953c6ef35d96a6e3f99c4b6c185bc45788416d Mon Sep 17 00:00:00 2001 From: Richard Cochran Date: Wed, 22 Aug 2012 05:02:20 +0200 Subject: [PATCH] Drop stale delay requests after the clock jumps in time. Signed-off-by: Richard Cochran --- port.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/port.c b/port.c index 491b525..fe44c7a 100644 --- a/port.c +++ b/port.c @@ -418,8 +418,18 @@ static void port_synchronize(struct port *p, correction1, correction2); switch (state) { case SERVO_UNLOCKED: + port_dispatch(p, EV_SYNCHRONIZATION_FAULT, 0); + break; case SERVO_JUMP: port_dispatch(p, EV_SYNCHRONIZATION_FAULT, 0); + if (p->delay_req) { + msg_put(p->delay_req); + p->delay_req = NULL; + } + if (p->peer_delay_req) { + msg_put(p->peer_delay_req); + p->peer_delay_req = NULL; + } break; case SERVO_LOCKED: port_dispatch(p, EV_MASTER_CLOCK_SELECTED, 0);