From 12b967cce2e06840dd9bccc67971b617c8f43a3c Mon Sep 17 00:00:00 2001
From: Jintao Lin <jintaolin@google.com>
Date: Tue, 27 Oct 2020 00:19:54 +0800
Subject: [PATCH] [mlr] fix build when OPENTHREAD_CONFIG_IP6_SLAAC_ENABLE is
 disabled (#5711)

---
 src/cli/cli.hpp          |  4 +---
 src/core/api/ip6_api.cpp | 30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/cli/cli.hpp b/src/cli/cli.hpp
index a568ba341..b84c9881d 100644
--- a/src/cli/cli.hpp
+++ b/src/cli/cli.hpp
@@ -359,10 +359,9 @@ private:
     otError ProcessLinkMetrics(uint8_t aArgsLength, char *aArgs[]);
     otError ProcessLinkMetricsQuery(uint8_t aArgsLength, char *aArgs[]);
 #endif
-#if OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE
+#if OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE
     otError ProcessMlr(uint8_t aArgsLength, char *aArgs[]);
 
-#if OPENTHREAD_CONFIG_COMMISSIONER_ENABLE
     otError ProcessMlrReg(uint8_t aArgsLength, char *aArgs[]);
 
     static void HandleMlrRegResult(void *              aContext,
@@ -374,7 +373,6 @@ private:
                                    uint8_t             aMlrStatus,
                                    const otIp6Address *aFailedAddresses,
                                    uint8_t             aFailedAddressNum);
-#endif
 #endif
     otError ProcessMode(uint8_t aArgsLength, char *aArgs[]);
 #if OPENTHREAD_FTD
diff --git a/src/core/api/ip6_api.cpp b/src/core/api/ip6_api.cpp
index 51679a5b1..a24890d56 100644
--- a/src/core/api/ip6_api.cpp
+++ b/src/core/api/ip6_api.cpp
@@ -258,6 +258,21 @@ exit:
     return error;
 }
 
+#if OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE
+otError otIp6RegisterMulticastListeners(otInstance *                            aInstance,
+                                        const otIp6Address *                    aAddresses,
+                                        uint8_t                                 aAddressNum,
+                                        const uint32_t *                        aTimeout,
+                                        otIp6RegisterMulticastListenersCallback aCallback,
+                                        void *                                  aContext)
+{
+    Instance &instance = *static_cast<Instance *>(aInstance);
+
+    return instance.Get<MlrManager>().RegisterMulticastListeners(aAddresses, aAddressNum, aTimeout, aCallback,
+                                                                 aContext);
+}
+#endif
+
 #if OPENTHREAD_CONFIG_IP6_SLAAC_ENABLE
 
 bool otIp6IsSlaacEnabled(otInstance *aInstance)
@@ -286,19 +301,4 @@ void otIp6SetSlaacPrefixFilter(otInstance *aInstance, otIp6SlaacPrefixFilter aFi
     instance.Get<Utils::Slaac>().SetFilter(aFilter);
 }
 
-#if OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE
-otError otIp6RegisterMulticastListeners(otInstance *                            aInstance,
-                                        const otIp6Address *                    aAddresses,
-                                        uint8_t                                 aAddressNum,
-                                        const uint32_t *                        aTimeout,
-                                        otIp6RegisterMulticastListenersCallback aCallback,
-                                        void *                                  aContext)
-{
-    Instance &instance = *static_cast<Instance *>(aInstance);
-
-    return instance.Get<MlrManager>().RegisterMulticastListeners(aAddresses, aAddressNum, aTimeout, aCallback,
-                                                                 aContext);
-}
-#endif
-
 #endif // OPENTHREAD_CONFIG_IP6_SLAAC_ENABLE