Merge branch 'bugfix/fix_ipv6_nd6_max_queue_num_v3' into 'release/v3.2'

lfix IPv6 ND6 queue too much pkts cause no mem issue(backport v3.2)

See merge request espressif/esp-idf!10176
This commit is contained in:
Jiang Jiang Jian 2020-09-24 11:36:56 +08:00
commit 97a95fd160
3 changed files with 23 additions and 1 deletions

View file

@ -537,6 +537,19 @@ config TCPIP_TASK_AFFINITY
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)"

@ -1 +1 @@
Subproject commit d6fc3be058ad9b1a1c3ba29db0511caf1edcb497
Subproject commit db9134beabe908b1960948be6c52b5bcf153bc5d

View file

@ -686,6 +686,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
/*
---------------------------------------