From 5081882bb9a3419a0f05614f52e0efa667821579 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Bida?= <85344032+canisLupus1313@users.noreply.github.com> Date: Tue, 9 May 2023 20:33:54 +0200 Subject: [PATCH] [link-metrics] fix compilation errors (#9033) Link metric macros `OPENTHREAD_CONFIG_MLE_LINK_METRICS_INITIATOR_ENABLE` and `OPENTHREAD_CONFIG_MLE_LINK_METRICS_SUBJECT_ENABLE` were guarding incorrect parts of code. Signed-off-by: Przemyslaw Bida --- src/core/mac/mac.hpp | 2 +- src/core/thread/topology.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/mac/mac.hpp b/src/core/mac/mac.hpp index d30b223a4..356610941 100644 --- a/src/core/mac/mac.hpp +++ b/src/core/mac/mac.hpp @@ -795,7 +795,7 @@ private: #if OPENTHREAD_FTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE void ProcessCsl(const RxFrame &aFrame, const Address &aSrcAddr); #endif -#if OPENTHREAD_CONFIG_MLE_LINK_METRICS_SUBJECT_ENABLE +#if OPENTHREAD_CONFIG_MLE_LINK_METRICS_INITIATOR_ENABLE void ProcessEnhAckProbing(const RxFrame &aFrame, const Neighbor &aNeighbor); #endif static const char *OperationToString(Operation aOperation); diff --git a/src/core/thread/topology.cpp b/src/core/thread/topology.cpp index 10959f86f..651bf855a 100644 --- a/src/core/thread/topology.cpp +++ b/src/core/thread/topology.cpp @@ -176,7 +176,7 @@ void Neighbor::GenerateChallenge(void) Random::Crypto::FillBuffer(mValidPending.mPending.mChallenge, sizeof(mValidPending.mPending.mChallenge))); } -#if OPENTHREAD_CONFIG_MLE_LINK_METRICS_INITIATOR_ENABLE || OPENTHREAD_CONFIG_MLE_LINK_METRICS_SUBJECT_ENABLE +#if OPENTHREAD_CONFIG_MLE_LINK_METRICS_SUBJECT_ENABLE void Neighbor::AggregateLinkMetrics(uint8_t aSeriesId, uint8_t aFrameType, uint8_t aLqi, int8_t aRss) { for (LinkMetrics::SeriesInfo &entry : mLinkMetricsSeriesInfoList) @@ -211,7 +211,7 @@ void Neighbor::RemoveAllForwardTrackingSeriesInfo(void) Get().Free(*seriesInfo); } } -#endif // OPENTHREAD_CONFIG_MLE_LINK_METRICS_INITIATOR_ENABLE || OPENTHREAD_CONFIG_MLE_LINK_METRICS_SUBJECT_ENABLE +#endif // OPENTHREAD_CONFIG_MLE_LINK_METRICS_SUBJECT_ENABLE const char *Neighbor::StateToString(State aState) {