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

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

diff --git a/src/core/thread/mle_router.cpp b/src/core/thread/mle_router.cpp
index f5352a18d..21fdf6856 100644
--- a/src/core/thread/mle_router.cpp
+++ b/src/core/thread/mle_router.cpp
@@ -386,7 +386,7 @@ bool MleRouter::HandleAdvertiseTimer(void)
 
     VerifyOrExit(IsRouterEligible(), continueTrickle = false);
 
-    IgnoreError(SendAdvertisement());
+    SendAdvertisement();
 
 exit:
     return continueTrickle;
@@ -413,7 +413,7 @@ exit:
     return;
 }
 
-otError MleRouter::SendAdvertisement(void)
+void MleRouter::SendAdvertisement(void)
 {
     otError      error = OT_ERROR_NONE;
     Ip6::Address destination;
@@ -460,12 +460,15 @@ otError MleRouter::SendAdvertisement(void)
 
 exit:
 
-    if (error != OT_ERROR_NONE && message != NULL)
+    if (error != OT_ERROR_NONE)
     {
-        message->Free();
-    }
+        otLogWarnMle("Failed to send Advertisement: %s", otThreadErrorToString(error));
 
-    return error;
+        if (message != NULL)
+        {
+            message->Free();
+        }
+    }
 }
 
 otError MleRouter::SendLinkRequest(Neighbor *aNeighbor)
@@ -1778,7 +1781,7 @@ void MleRouter::HandleStateUpdateTimer(void)
 
             if (!mAdvertiseTimer.IsRunning())
             {
-                IgnoreError(SendAdvertisement());
+                SendAdvertisement();
 
                 IgnoreError(mAdvertiseTimer.Start(Time::SecToMsec(kReedAdvertiseInterval),
                                                   Time::SecToMsec(kReedAdvertiseInterval + kReedAdvertiseJitter),
diff --git a/src/core/thread/mle_router.hpp b/src/core/thread/mle_router.hpp
index 304c93e37..661c8e261 100644
--- a/src/core/thread/mle_router.hpp
+++ b/src/core/thread/mle_router.hpp
@@ -762,7 +762,7 @@ private:
     void    SendAddressSolicitResponse(const Coap::Message &   aRequest,
                                        const Router *          aRouter,
                                        const Ip6::MessageInfo &aMessageInfo);
-    otError SendAdvertisement(void);
+    void    SendAdvertisement(void);
     otError SendLinkAccept(const Ip6::MessageInfo &aMessageInfo,
                            Neighbor *              aNeighbor,
                            const RequestedTlvs &   aRequestedTlvs,