Inhibit lost link recovery in P2P mode.

The closing and reopening of the transport when in slave only mode is not
necessary if the port is using the peer delay mechanism. In that case, the
port will discover the network error by transmitting a peer delay request.

Signed-off-by: Richard Cochran <richardcochran@gmail.com>
Acked-by: Delio Brignoli <dbrignoli@audioscience.com>
master
Richard Cochran 2013-08-26 14:42:27 +02:00
parent b268cf048b
commit 78d3669b06
1 changed files with 2 additions and 1 deletions

3
port.c
View File

@ -1991,7 +1991,8 @@ enum fsm_event port_event(struct port *p, int fd_index)
if (p->best) if (p->best)
fc_clear(p->best); fc_clear(p->best);
port_set_announce_tmo(p); port_set_announce_tmo(p);
if (clock_slave_only(p->clock) && port_renew_transport(p)) { if (clock_slave_only(p->clock) && p->delayMechanism != DM_P2P &&
port_renew_transport(p)) {
return EV_FAULT_DETECTED; return EV_FAULT_DETECTED;
} }
return EV_ANNOUNCE_RECEIPT_TIMEOUT_EXPIRES; return EV_ANNOUNCE_RECEIPT_TIMEOUT_EXPIRES;