From e167a1f07168cfb1a7f32129b6c4b30b588a3725 Mon Sep 17 00:00:00 2001 From: Abtin Keshavarzian Date: Wed, 21 Dec 2022 11:36:38 -0800 Subject: [PATCH] [core] use `kThreadVersion1pX` constants (#8562) --- src/core/thread/mle.cpp | 2 +- src/core/thread/mle_router.cpp | 8 ++++---- src/core/thread/topology.hpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/core/thread/mle.cpp b/src/core/thread/mle.cpp index 4f64d50b4..3ae7fa9a3 100644 --- a/src/core/thread/mle.cpp +++ b/src/core/thread/mle.cpp @@ -3101,7 +3101,7 @@ void Mle::HandleParentResponse(RxInfo &aRxInfo) // Version SuccessOrExit(error = Tlv::Find(aRxInfo.mMessage, version)); - VerifyOrExit(version >= OT_THREAD_VERSION_1_1, error = kErrorParse); + VerifyOrExit(version >= kThreadVersion1p1, error = kErrorParse); // Response SuccessOrExit(error = aRxInfo.mMessage.ReadResponseTlv(response)); diff --git a/src/core/thread/mle_router.cpp b/src/core/thread/mle_router.cpp index da41752d1..e0e9668d0 100644 --- a/src/core/thread/mle_router.cpp +++ b/src/core/thread/mle_router.cpp @@ -634,7 +634,7 @@ void MleRouter::HandleLinkRequest(RxInfo &aRxInfo) // Version SuccessOrExit(error = Tlv::Find(aRxInfo.mMessage, version)); - VerifyOrExit(version >= OT_THREAD_VERSION_1_1, error = kErrorParse); + VerifyOrExit(version >= kThreadVersion1p1, error = kErrorParse); // Leader Data switch (aRxInfo.mMessage.ReadLeaderDataTlv(leaderData)) @@ -888,7 +888,7 @@ Error MleRouter::HandleLinkAccept(RxInfo &aRxInfo, bool aRequest) // Version SuccessOrExit(error = Tlv::Find(aRxInfo.mMessage, version)); - VerifyOrExit(version >= OT_THREAD_VERSION_1_1, error = kErrorParse); + VerifyOrExit(version >= kThreadVersion1p1, error = kErrorParse); // Link and MLE Frame Counters SuccessOrExit(error = aRxInfo.mMessage.ReadFrameCounterTlvs(linkFrameCounter, mleFrameCounter)); @@ -1600,7 +1600,7 @@ void MleRouter::HandleParentRequest(RxInfo &aRxInfo) // Version SuccessOrExit(error = Tlv::Find(aRxInfo.mMessage, version)); - VerifyOrExit(version >= OT_THREAD_VERSION_1_1, error = kErrorParse); + VerifyOrExit(version >= kThreadVersion1p1, error = kErrorParse); // Scan Mask SuccessOrExit(error = Tlv::Find(aRxInfo.mMessage, scanMask)); @@ -2241,7 +2241,7 @@ void MleRouter::HandleChildIdRequest(RxInfo &aRxInfo) // Version SuccessOrExit(error = Tlv::Find(aRxInfo.mMessage, version)); - VerifyOrExit(version >= OT_THREAD_VERSION_1_1, error = kErrorParse); + VerifyOrExit(version >= kThreadVersion1p1, error = kErrorParse); // Response SuccessOrExit(error = aRxInfo.mMessage.ReadResponseTlv(response)); diff --git a/src/core/thread/topology.hpp b/src/core/thread/topology.hpp index 001466120..4cd5cca44 100644 --- a/src/core/thread/topology.hpp +++ b/src/core/thread/topology.hpp @@ -584,7 +584,7 @@ public: */ bool IsEnhancedKeepAliveSupported(void) const { - return mState != kStateInvalid && mVersion >= OT_THREAD_VERSION_1_2; + return (mState != kStateInvalid) && (mVersion >= kThreadVersion1p2); } /**