diff --git a/src/core/thread/mesh_forwarder_ftd.cpp b/src/core/thread/mesh_forwarder_ftd.cpp index 1d3143264..2600b77fc 100644 --- a/src/core/thread/mesh_forwarder_ftd.cpp +++ b/src/core/thread/mesh_forwarder_ftd.cpp @@ -395,8 +395,6 @@ otError MeshForwarder::UpdateIp6RouteFtd(Ip6::Header &ip6Header) { SuccessOrExit(error = MeshCoP::GetBorderAgentRloc(Get(), mMeshDest)); } - -#if OPENTHREAD_CONFIG_DHCP6_SERVER_ENABLE || OPENTHREAD_CONFIG_DHCP6_CLIENT_ENABLE else if (aloc16 <= Mle::kAloc16DhcpAgentEnd) { uint16_t agentRloc16; @@ -418,8 +416,6 @@ otError MeshForwarder::UpdateIp6RouteFtd(Ip6::Header &ip6Header) mMeshDest = Mle::Mle::GetRloc16(routerId); } } - -#endif // OPENTHREAD_CONFIG_DHCP6_SERVER_ENABLE || OPENTHREAD_CONFIG_DHCP6_CLIENT_ENABLE #if OPENTHREAD_CONFIG_TMF_NETDATA_SERVICE_ENABLE else if ((aloc16 >= Mle::kAloc16ServiceStart) && (aloc16 <= Mle::kAloc16ServiceEnd)) { diff --git a/src/core/thread/network_data_leader.cpp b/src/core/thread/network_data_leader.cpp index 2514752f2..a1bc6670c 100644 --- a/src/core/thread/network_data_leader.cpp +++ b/src/core/thread/network_data_leader.cpp @@ -163,7 +163,6 @@ exit: return error; } -#if OPENTHREAD_CONFIG_DHCP6_SERVER_ENABLE || OPENTHREAD_CONFIG_DHCP6_CLIENT_ENABLE otError LeaderBase::GetRlocByContextId(uint8_t aContextId, uint16_t &aRloc16) { otError error = OT_ERROR_NOT_FOUND; @@ -188,7 +187,6 @@ otError LeaderBase::GetRlocByContextId(uint8_t aContextId, uint16_t &aRloc16) exit: return error; } -#endif // OPENTHREAD_CONFIG_DHCP6_SERVER_ENABLE || OPENTHREAD_CONFIG_DHCP6_CLIENT_ENABLE bool LeaderBase::IsOnMesh(const Ip6::Address &aAddress) { diff --git a/src/core/thread/network_data_leader.hpp b/src/core/thread/network_data_leader.hpp index 61399f34a..2d0b99abf 100644 --- a/src/core/thread/network_data_leader.hpp +++ b/src/core/thread/network_data_leader.hpp @@ -217,7 +217,6 @@ public: */ otError SetCommissioningData(const uint8_t *aValue, uint8_t aValueLength); -#if OPENTHREAD_CONFIG_DHCP6_SERVER_ENABLE || OPENTHREAD_CONFIG_DHCP6_CLIENT_ENABLE /** * This method gets the Rloc of Dhcp Agent of specified contextId. * @@ -229,7 +228,6 @@ public: * */ otError GetRlocByContextId(uint8_t aContextId, uint16_t &aRloc16); -#endif // OPENTHREAD_CONFIG_DHCP6_SERVER_ENABLE || OPENTHREAD_CONFIG_DHCP6_CLIENT_ENABLE protected: uint8_t mStableVersion;