From 5d09ce7124be70edc9b635ca9b8670979dbe9835 Mon Sep 17 00:00:00 2001
From: Abtin Keshavarzian <abtink@google.com>
Date: Thu, 8 Aug 2019 08:32:33 -0700
Subject: [PATCH] [config] remove duplicate unused definitions and fix comments
 (#4069)

This commit removes the unused duplicate definition in `tmf.h` for
`OPENTHREAD_CONFIG_INFORM_PREVIOUS_PARENT_ON_REATTACH` (this is
defined in `config/mle.h`). Also updates the comment/documentation
for `DHCP6_SERVER_NUM_PREFIXES` and `JOINER_MAX_CANDIDATES`.
---
 include/openthread/thread.h    |  4 ++--
 src/core/config/dhcp6_server.h |  2 +-
 src/core/config/joiner.h       |  2 +-
 src/core/config/tmf.h          | 13 -------------
 4 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/include/openthread/thread.h b/include/openthread/thread.h
index 4aa200aae..68bc20af4 100644
--- a/include/openthread/thread.h
+++ b/include/openthread/thread.h
@@ -172,8 +172,8 @@ typedef struct otMleCounters
     /**
      * Number of times device changed its parents.
      *
-     * Support for this counter requires the feature option OPENTHREAD_CONFIG_INFORM_PREVIOUS_PARENT_ON_REATTACH to be
-     * enabled.
+     * Support for this counter requires the feature option OPENTHREAD_CONFIG_MLE_INFORM_PREVIOUS_PARENT_ON_REATTACH to
+     * be enabled.
      *
      * A parent change can happen if device detaches from its current parent and attaches to a different one, or even
      * while device is attached when the periodic parent search feature is enabled  (please see option
diff --git a/src/core/config/dhcp6_server.h b/src/core/config/dhcp6_server.h
index 7606afe9f..d833c6d5d 100644
--- a/src/core/config/dhcp6_server.h
+++ b/src/core/config/dhcp6_server.h
@@ -46,7 +46,7 @@
 #endif
 
 /**
- * @def OPENTHREAD_CONFIG_NUM_DHCP_PREFIXES
+ * @def OPENTHREAD_CONFIG_DHCP6_SERVER_NUM_PREFIXES
  *
  * The number of dhcp prefixes.
  *
diff --git a/src/core/config/joiner.h b/src/core/config/joiner.h
index bf53fe3a3..c01dc3056 100644
--- a/src/core/config/joiner.h
+++ b/src/core/config/joiner.h
@@ -46,7 +46,7 @@
 #endif
 
 /**
- * @def OPENTHREAD_CONFIG_MAX_JOINER_ENTRIES
+ * @def OPENTHREAD_CONFIG_JOINER_MAX_CANDIDATES
  *
  * The maximum number of Joiner Router entries that can be queued by the Joiner.
  *
diff --git a/src/core/config/tmf.h b/src/core/config/tmf.h
index 139f73369..37f891b55 100644
--- a/src/core/config/tmf.h
+++ b/src/core/config/tmf.h
@@ -147,17 +147,4 @@
 #define OPENTHREAD_CONFIG_TMF_NETWORK_DIAG_MTD_ENABLE 0
 #endif
 
-/**
- * @def OPENTHREAD_CONFIG_INFORM_PREVIOUS_PARENT_ON_REATTACH
- *
- * Define as 1 for a child to inform its previous parent when it attaches to a new parent.
- *
- * If this feature is enabled, when a device attaches to a new parent, it will send an IP message (with empty payload
- * and mesh-local IP address as the source address) to its previous parent.
- *
- */
-#ifndef OPENTHREAD_CONFIG_INFORM_PREVIOUS_PARENT_ON_REATTACH
-#define OPENTHREAD_CONFIG_INFORM_PREVIOUS_PARENT_ON_REATTACH 0
-#endif
-
 #endif // CONFIG_TMF_H_