From 186ad2f6aa746f11499e516f8d6f50d82887152e Mon Sep 17 00:00:00 2001
From: ChenJianxing <chenjianxing@espressif.com>
Date: Thu, 27 Aug 2020 15:10:56 +0800
Subject: [PATCH] lwip: fix IPv6 ND6 queue too much pkts cause no mem issue and
 add menuconfig item for this params.

---
 components/lwip/Kconfig                       | 13 +++++++++++++
 components/lwip/lwip                          |  2 +-
 components/lwip/port/esp32/include/lwipopts.h |  9 +++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/components/lwip/Kconfig b/components/lwip/Kconfig
index 782bc8060..f307ef04a 100644
--- a/components/lwip/Kconfig
+++ b/components/lwip/Kconfig
@@ -539,6 +539,19 @@ menu "LWIP"
         default 0x0 if TCPIP_TASK_AFFINITY_CPU0
         default 0x1 if TCPIP_TASK_AFFINITY_CPU1
 
+    config LWIP_IPV6_MEMP_NUM_ND6_QUEUE
+        int "Max number of IPv6 packets to queue during MAC resolution"
+        range 3 20
+        default 3
+        help
+            Config max number of IPv6 packets to queue during MAC resolution.
+
+    config LWIP_IPV6_ND6_NUM_NEIGHBORS
+        int "Max number of entries in IPv6 neighbor cache"
+        range 3 10
+        default 5
+        help
+            Config max number of entries in IPv6 neighbor cache.
 
     menuconfig PPP_SUPPORT
         bool "Enable PPP support (new/experimental)"
diff --git a/components/lwip/lwip b/components/lwip/lwip
index d6fc3be05..db9134bea 160000
--- a/components/lwip/lwip
+++ b/components/lwip/lwip
@@ -1 +1 @@
-Subproject commit d6fc3be058ad9b1a1c3ba29db0511caf1edcb497
+Subproject commit db9134beabe908b1960948be6c52b5bcf153bc5d
diff --git a/components/lwip/port/esp32/include/lwipopts.h b/components/lwip/port/esp32/include/lwipopts.h
index d46a0bd2b..ad9a776f8 100644
--- a/components/lwip/port/esp32/include/lwipopts.h
+++ b/components/lwip/port/esp32/include/lwipopts.h
@@ -691,6 +691,15 @@
  */
 #define LWIP_ND6_RDNSS_MAX_DNS_SERVERS  0
 
+/**
+ * MEMP_NUM_ND6_QUEUE: Max number of IPv6 packets to queue during MAC resolution.
+ */
+#define MEMP_NUM_ND6_QUEUE              CONFIG_LWIP_IPV6_MEMP_NUM_ND6_QUEUE
+
+/**
+ * LWIP_ND6_NUM_NEIGHBORS: Number of entries in IPv6 neighbor cache
+ */
+#define LWIP_ND6_NUM_NEIGHBORS          CONFIG_LWIP_IPV6_ND6_NUM_NEIGHBORS
 
 /*
    ---------------------------------------