Merge branch 'feature/openthread_disable_nd6_timer' into 'master'

openthread: disable lwip nd6 timer in openthread sleepy device See merge request espressif/esp-idf!24653
espressif · Aug 23, 2023 · 7af7723 · 7af7723
2 parents 329bc7e + c84cbd5
commit 7af7723
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 2 deletions.
diff --git a/components/lwip/Kconfig b/components/lwip/Kconfig
@@ -80,6 +80,14 @@ menu "LWIP"
             This feature will reduce the power consumption for applications which do not
             use IGMP and MLD6.
 
+    config LWIP_ND6
+        bool "LWIP NDP6 Enable/Disable"
+        default y
+        depends on LWIP_IPV6
+        help
+            This option is used to disable the Network Discovery Protocol (NDP) if it is not required.
+            Please use this option with caution, as the NDP is essential for IPv6 functionality within a local network.
+
     config LWIP_MAX_SOCKETS
         int "Max number of open sockets"
         range 1 16

diff --git a/components/lwip/lwip b/components/lwip/lwip
diff --git a/components/lwip/port/include/lwipopts.h b/components/lwip/port/include/lwipopts.h
@@ -1126,6 +1126,15 @@ static inline uint32_t timeout_from_offered(uint32_t lease, uint32_t min)
 #define LWIP_IPV6                       0
 #endif
 
+/**
+ * LWIP_ND6==1: Enable ND6 protocol in IPv6
+ */
+#ifdef CONFIG_LWIP_ND6
+#define LWIP_ND6                        1
+#else
+#define LWIP_ND6                        0
+#endif
+
 /**
  * LWIP_IPV6_NUM_ADDRESSES: Number of IPv6 addresses per netif.
  */

diff --git a/examples/openthread/ot_sleepy_device/sdkconfig.defaults b/examples/openthread/ot_sleepy_device/sdkconfig.defaults
@@ -32,7 +32,8 @@ CONFIG_OPENTHREAD_DNS64_CLIENT=y
 #
 CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=4096
 CONFIG_LWIP_IPV6_NUM_ADDRESSES=8
-CONFIG_LWIP_MULTICAST_PING=y
+CONFIG_LWIP_IPV4=n
+CONFIG_LWIP_ND6=n
 # end of lwIP
 
 #
@@ -48,4 +49,7 @@ CONFIG_PM_ENABLE=y
 CONFIG_FREERTOS_USE_TICKLESS_IDLE=y
 CONFIG_PM_POWER_DOWN_PERIPHERAL_IN_LIGHT_SLEEP=y
 CONFIG_IEEE802154_SLEEP_ENABLE=y
+# Use 1000Hz freertos tick to lower sleep time threshold
+CONFIG_FREERTOS_HZ=1000
+CONFIG_ESP_SLEEP_POWER_DOWN_FLASH=y
 # end of light sleep
+1 −0		doc/doxygen/lwip.Doxyfile
+1 −0		doc/doxygen/lwip.Doxyfile.cmake.in
+2 −0		src/core/ipv6/icmp6.c
+6 −0		src/core/ipv6/ip6.c
+4 −0		src/core/ipv6/ip6_frag.c
+2 −2		src/core/ipv6/nd6.c
+10 −8		src/core/netif.c
+5 −0		src/core/tcp.c
+4 −4		src/core/tcp_in.c
+2 −0		src/core/timeouts.c
+12 −0		src/include/lwip/opt.h
+1 −0		test/apps/lwipopts.h
+1 −0		test/fuzz/lwipopts.h
+1 −0		test/unit/lwipopts.h