From 40f4d20c9d4fa0771be8353fb9a0f2068d238fb7 Mon Sep 17 00:00:00 2001
From: Jonathan Hui <jonhui@google.com>
Date: Fri, 8 May 2020 14:39:30 -0700
Subject: [PATCH] [mle] change HandleChildStart() to return void (#4941)

---
 src/core/thread/mle.cpp        | 2 +-
 src/core/thread/mle_router.cpp | 8 ++------
 src/core/thread/mle_router.hpp | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/core/thread/mle.cpp b/src/core/thread/mle.cpp
index 605e65c25..41da7ec14 100644
--- a/src/core/thread/mle.cpp
+++ b/src/core/thread/mle.cpp
@@ -790,7 +790,7 @@ void Mle::SetStateChild(uint16_t aRloc16)
 #if OPENTHREAD_FTD
     if (IsFullThreadDevice())
     {
-        IgnoreError(Get<MleRouter>().HandleChildStart(mParentRequestMode));
+        Get<MleRouter>().HandleChildStart(mParentRequestMode);
     }
 #endif
 
diff --git a/src/core/thread/mle_router.cpp b/src/core/thread/mle_router.cpp
index d67376a7a..dd110c0eb 100644
--- a/src/core/thread/mle_router.cpp
+++ b/src/core/thread/mle_router.cpp
@@ -229,10 +229,8 @@ void MleRouter::HandleDetachStart(void)
     mStateUpdateTimer.Stop();
 }
 
-otError MleRouter::HandleChildStart(AttachMode aMode)
+void MleRouter::HandleChildStart(AttachMode aMode)
 {
-    otError error = OT_ERROR_NONE;
-
     // reset `rejected` flag whenever REED becomes child.
     mAddressSolicitRejected = false;
 
@@ -248,7 +246,7 @@ otError MleRouter::HandleChildStart(AttachMode aMode)
 
     IgnoreError(Get<ThreadNetif>().SubscribeAllRoutersMulticast());
 
-    VerifyOrExit(IsRouterIdValid(mPreviousRouterId), error = OT_ERROR_INVALID_STATE);
+    VerifyOrExit(IsRouterIdValid(mPreviousRouterId), OT_NOOP);
 
     switch (aMode)
     {
@@ -306,8 +304,6 @@ exit:
     {
         SetRouterId(kInvalidRouterId);
     }
-
-    return error;
 }
 
 void MleRouter::SetStateRouter(uint16_t aRloc16)
diff --git a/src/core/thread/mle_router.hpp b/src/core/thread/mle_router.hpp
index ac7b29190..304c93e37 100644
--- a/src/core/thread/mle_router.hpp
+++ b/src/core/thread/mle_router.hpp
@@ -725,7 +725,7 @@ private:
     void    GetNeighborInfo(Neighbor &aNeighbor, otNeighborInfo &aNeighInfo);
     otError RefreshStoredChildren(void);
     void    HandleDetachStart(void);
-    otError HandleChildStart(AttachMode aMode);
+    void    HandleChildStart(AttachMode aMode);
     void    HandleLinkRequest(const Message &aMessage, const Ip6::MessageInfo &aMessageInfo, Neighbor *aNeighbor);
     void    HandleLinkAccept(const Message &         aMessage,
                              const Ip6::MessageInfo &aMessageInfo,