From afcbe5b0562f48809836ba71af2c484f2d73823e Mon Sep 17 00:00:00 2001 From: Zhanglong Xia Date: Tue, 12 Aug 2025 03:20:06 +0800 Subject: [PATCH] [child] remove duplicated OPENTHREAD_FTDs (#11803) --- src/core/thread/child.cpp | 6 +++--- src/core/thread/child.hpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/thread/child.cpp b/src/core/thread/child.cpp index f5d382b32..a69b3559e 100644 --- a/src/core/thread/child.cpp +++ b/src/core/thread/child.cpp @@ -63,7 +63,7 @@ void Child::Info::SetFrom(const Child &aChild) mFullNetworkData = (aChild.GetNetworkDataType() == NetworkData::kFullSet); mIsStateRestoring = aChild.IsStateRestoring(); mSupervisionInterval = aChild.GetSupervisionInterval(); -#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE mIsCslSynced = aChild.IsCslSynchronized(); #else mIsCslSynced = false; @@ -127,7 +127,7 @@ void Child::ClearIp6Addresses(void) { mMeshLocalIid.Clear(); mIp6Addresses.Clear(); -#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE +#if OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE mMlrToRegisterSet.Clear(); mMlrRegisteredSet.Clear(); #endif @@ -263,7 +263,7 @@ exit: return hasAddress; } -#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE +#if OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE Error Child::GetDomainUnicastAddress(Ip6::Address &aAddress) const { Error error = kErrorNotFound; diff --git a/src/core/thread/child.hpp b/src/core/thread/child.hpp index 1fd235ef3..4a81ae5a5 100644 --- a/src/core/thread/child.hpp +++ b/src/core/thread/child.hpp @@ -231,7 +231,7 @@ public: */ bool HasIp6Address(const Ip6::Address &aAddress) const; -#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE +#if OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE /** * Retrieves the Domain Unicast Address registered by the child. *