diff options
| author | andrew-elder <aelder@audioscience.com> | 2017-05-23 11:12:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-23 11:12:58 -0400 |
| commit | 8fb233d7c7c70acae6e19e6a02ff96a8dce77cfd (patch) | |
| tree | 8c18aacffe05cf4f90c319160e451d379107647a /daemons/gptp/common/ether_port.cpp | |
| parent | f9dc5ba8e57563b6efeedb5b7cc3c7e92b3daf5e (diff) | |
| parent | 14449796bd95f3972e680b39c1fc031128f236f1 (diff) | |
| download | Open-AVB-8fb233d7c7c70acae6e19e6a02ff96a8dce77cfd.tar.gz | |
Merge pull request #603 from PawelModrzejewski/open-avb-next
gPTP: change HWTimestamper_adjclockrate into const function
Diffstat (limited to 'daemons/gptp/common/ether_port.cpp')
| -rw-r--r-- | daemons/gptp/common/ether_port.cpp | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/daemons/gptp/common/ether_port.cpp b/daemons/gptp/common/ether_port.cpp index 8735987c..f517c181 100644 --- a/daemons/gptp/common/ether_port.cpp +++ b/daemons/gptp/common/ether_port.cpp @@ -581,23 +581,15 @@ bool EtherPort::_processEvent( Event e ) if ( tx_succeed ) { + Timestamp sync_timestamp = sync->getTimestamp(); + GPTP_LOG_VERBOSE("Successful Sync timestamp"); GPTP_LOG_VERBOSE("Seconds: %u", sync_timestamp.seconds_ls); GPTP_LOG_VERBOSE("Nanoseconds: %u", sync_timestamp.nanoseconds); - } else { - GPTP_LOG_ERROR - ("*** Unsuccessful Sync timestamp"); - } - PTPMessageFollowUp *follow_up; - if ( tx_succeed ) - { - Timestamp sync_timestamp = - sync->getTimestamp(); - follow_up = - new PTPMessageFollowUp(this); + PTPMessageFollowUp *follow_up = new PTPMessageFollowUp(this); PortIdentity dest_id; getPortIdentity(dest_id); @@ -609,9 +601,10 @@ bool EtherPort::_processEvent( Event e ) follow_up->sendPort(this, NULL); delete follow_up; } else { + GPTP_LOG_ERROR + ("*** Unsuccessful Sync timestamp"); } delete sync; - } break; case FAULT_DETECTED: |