From 5e50914f1f8f937ea5620bbb413e8187b37f3139 Mon Sep 17 00:00:00 2001
From: Abtin Keshavarzian <abtink@google.com>
Date: Tue, 22 Jan 2019 09:05:50 -0800
Subject: [PATCH] [mle] simplify Start() (#3472)

This commit simplifies the `Mle::Start()` by combining its parameters.
With the new definition `Start()` would always try to reattach using
any saved active/pending dataset unless it is asked to attach on an
announced network (i.e., `aAnnounceAttach` is `true`).
---
 src/core/api/thread_api.cpp | 2 +-
 src/core/thread/mle.cpp     | 6 +++---
 src/core/thread/mle.hpp     | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/core/api/thread_api.cpp b/src/core/api/thread_api.cpp
index 564e8837c..92d1e6a01 100644
--- a/src/core/api/thread_api.cpp
+++ b/src/core/api/thread_api.cpp
@@ -447,7 +447,7 @@ otError otThreadSetEnabled(otInstance *aInstance, bool aEnabled)
     {
         VerifyOrExit(instance.GetThreadNetif().GetMac().GetPanId() != Mac::kPanIdBroadcast,
                      error = OT_ERROR_INVALID_STATE);
-        error = instance.GetThreadNetif().GetMle().Start(true, false);
+        error = instance.GetThreadNetif().GetMle().Start(/* aAnnounceAttach */ false);
     }
     else
     {
diff --git a/src/core/thread/mle.cpp b/src/core/thread/mle.cpp
index b1244c23b..078706ad9 100644
--- a/src/core/thread/mle.cpp
+++ b/src/core/thread/mle.cpp
@@ -236,7 +236,7 @@ exit:
     return error;
 }
 
-otError Mle::Start(bool aEnableReattach, bool aAnnounceAttach)
+otError Mle::Start(bool aAnnounceAttach)
 {
     ThreadNetif &netif = GetNetif();
     otError      error = OT_ERROR_NONE;
@@ -253,7 +253,7 @@ otError Mle::Start(bool aEnableReattach, bool aAnnounceAttach)
 
     netif.GetKeyManager().Start();
 
-    if (aEnableReattach)
+    if (!aAnnounceAttach)
     {
         mReattachState = kReattachStart;
     }
@@ -3658,7 +3658,7 @@ void Mle::ProcessAnnounce(void)
     mac.SetPanChannel(newChannel);
     mac.SetPanId(newPanId);
 
-    Start(/* aEnableReattach */ false, /* aAnnounceAttach */ true);
+    Start(/* aAnnounceAttach */ true);
 }
 
 otError Mle::HandleDiscoveryResponse(const Message &aMessage, const Ip6::MessageInfo &aMessageInfo)
diff --git a/src/core/thread/mle.hpp b/src/core/thread/mle.hpp
index ef9e3de01..d7e53ad9c 100644
--- a/src/core/thread/mle.hpp
+++ b/src/core/thread/mle.hpp
@@ -495,7 +495,6 @@ public:
     /**
      * This method starts the MLE protocol operation.
      *
-     * @param[in]  aEnableReattach True if reattach using stored dataset, or False if not.
      * @param[in]  aAnnounceAttach True if attach on the announced thread network with newer active timestamp,
      *                             or False if not.
      *
@@ -503,7 +502,7 @@ public:
      * @retval OT_ERROR_ALREADY  The protocol operation was already started.
      *
      */
-    otError Start(bool aEnableReattach, bool aAnnounceAttach);
+    otError Start(bool aAnnounceAttach);
 
     /**
      * This method stops the MLE protocol operation.