diff options
| author | Rich Roussel <rroussel@artandlogic.com> | 2017-10-04 07:56:01 -0700 |
|---|---|---|
| committer | Rich Roussel <rroussel@artandlogic.com> | 2017-10-04 07:56:01 -0700 |
| commit | 8f1bba2bb191fd08a9d10e45ab869dc9d19e4da1 (patch) | |
| tree | aadab24d8635f93a245b95ad47d2c339f32927e9 | |
| parent | aa937b6504d51cc26f89e1d358d80d2f19cd205c (diff) | |
| parent | 9252f71348091a25d2b4238d660d584aef9b672c (diff) | |
| download | Open-AVB-8f1bba2bb191fd08a9d10e45ab869dc9d19e4da1.tar.gz | |
Merge branch 'ArtAndLogic-aPTP-changes' of ../../gitlab/ApplePi into ArtAndLogic-aPTP-changes
| -rw-r--r-- | daemons/gptp/common/common_port.hpp | 5 | ||||
| -rw-r--r-- | daemons/gptp/common/ptp_message.cpp | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/daemons/gptp/common/common_port.hpp b/daemons/gptp/common/common_port.hpp index b2735603..636d1a17 100644 --- a/daemons/gptp/common/common_port.hpp +++ b/daemons/gptp/common/common_port.hpp @@ -738,6 +738,11 @@ public: */ void getExtendedError(char *msg); + void SyncIntervalTimeoutExpireCount(int value) + { + fSyncIntervalTimeoutExpireCount = value; + } + /** * @brief Increment IEEE Port counter: * ieee8021AsPortStatRxSyncCount diff --git a/daemons/gptp/common/ptp_message.cpp b/daemons/gptp/common/ptp_message.cpp index f37f666b..17aa0af3 100644 --- a/daemons/gptp/common/ptp_message.cpp +++ b/daemons/gptp/common/ptp_message.cpp @@ -2955,7 +2955,7 @@ void PTPMessageSignalling::processMessage( EtherPort *port ) if (timeSyncInterval == PTPMessageSignalling::sigMsgInterval_Initial) { GPTP_LOG_VERBOSE("PTPMessageSignalling::processMessage timeSyncInterval == sigMsgInterval_Initial"); - port->setInitSyncInterval(); + port->resetInitSyncInterval(); waitTime = ((long long) (pow((double)2, port->getSyncInterval()) * 1000000000.0)); #ifndef APTP |