Jelajahi Sumber

Rename Kconfig options (components/lwip)

Roland Dobai 6 tahun lalu
induk
melakukan
92950db44e

+ 1 - 1
components/esp_common/include/esp_task.h

@@ -51,7 +51,7 @@
 #define ESP_TASKD_EVENT_PRIO          (ESP_TASK_PRIO_MAX - 5)
 #define ESP_TASKD_EVENT_STACK         (CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE + TASK_EXTRA_STACK_SIZE)
 #define ESP_TASK_TCPIP_PRIO           (ESP_TASK_PRIO_MAX - 7)
-#define ESP_TASK_TCPIP_STACK          (CONFIG_TCPIP_TASK_STACK_SIZE + TASK_EXTRA_STACK_SIZE)
+#define ESP_TASK_TCPIP_STACK          (CONFIG_LWIP_TCPIP_TASK_STACK_SIZE + TASK_EXTRA_STACK_SIZE)
 #define ESP_TASK_MAIN_PRIO            (ESP_TASK_PRIO_MIN + 1)
 #define ESP_TASK_MAIN_STACK           (CONFIG_MAIN_TASK_STACK_SIZE + TASK_EXTRA_STACK_SIZE)
 

+ 1 - 1
components/lwip/CMakeLists.txt

@@ -89,7 +89,7 @@ set(COMPONENT_SRCS "apps/dhcpserver/dhcpserver.c"
                    "port/esp32/netif/ethernetif.c"
                    "port/esp32/netif/wlanif.c")
 
-if(CONFIG_PPP_SUPPORT)
+if(CONFIG_LWIP_PPP_SUPPORT)
     list(APPEND COMPONENT_SRCS "lwip/src/netif/ppp/auth.c"
                    "lwip/src/netif/ppp/ccp.c"
                    "lwip/src/netif/ppp/chap-md5.c"

+ 49 - 49
components/lwip/Kconfig

@@ -1,6 +1,6 @@
 menu "LWIP"
 
-    config L2_TO_L3_COPY
+    config LWIP_L2_TO_L3_COPY
         bool "Enable copy between Layer2 and Layer3 packets"
         default n
         help
@@ -37,7 +37,7 @@ menu "LWIP"
             the maximum amount of sockets here. The valid value is from 1
             to 16.
 
-    config USE_ONLY_LWIP_SELECT
+    config LWIP_USE_ONLY_LWIP_SELECT
         bool "Support LWIP socket select() only"
         default n
         help
@@ -128,7 +128,7 @@ menu "LWIP"
             So the recommendation is to disable this option.
             Here the LAN peer means the other side to which the ESP station or soft-AP is connected.
 
-    config ESP_GRATUITOUS_ARP
+    config LWIP_ESP_GRATUITOUS_ARP
         bool "Send gratuitous ARP periodically"
         default y
         help
@@ -138,14 +138,14 @@ menu "LWIP"
             doesn't send ARP request to update it's ARP table, this will lead to the STA sending IP packet fail.
             Thus we send gratuitous ARP periodically to let AP update it's ARP table.
 
-    config GARP_TMR_INTERVAL
+    config LWIP_GARP_TMR_INTERVAL
         int "GARP timer interval(seconds)"
         default 60
-        depends on ESP_GRATUITOUS_ARP
+        depends on LWIP_ESP_GRATUITOUS_ARP
         help
             Set the timer interval for gratuitous ARP. The default value is 60s
 
-    config TCPIP_RECVMBOX_SIZE
+    config LWIP_TCPIP_RECVMBOX_SIZE
         int "TCPIP task receive mail box size"
         default 32
         range 6 64
@@ -278,21 +278,21 @@ menu "LWIP"
                 new listening TCP connections after the limit is reached.
 
 
-        config TCP_MAXRTX
+        config LWIP_TCP_MAXRTX
             int "Maximum number of retransmissions of data segments"
             default 12
             range 3 12
             help
                 Set maximum number of retransmissions of data segments.
 
-        config TCP_SYNMAXRTX
+        config LWIP_TCP_SYNMAXRTX
             int "Maximum number of retransmissions of SYN segments"
             default 6
             range 3 12
             help
                 Set maximum number of retransmissions of SYN segments.
 
-        config TCP_MSS
+        config LWIP_TCP_MSS
             int "Maximum Segment Size (MSS)"
             default 1440
             range 536 1460
@@ -303,13 +303,13 @@ menu "LWIP"
                 IPv4 TCP_MSS Range: 576 <= TCP_MSS <= 1460
                 IPv6 TCP_MSS Range: 1220<= TCP_mSS <= 1440
 
-        config TCP_MSL
+        config LWIP_TCP_MSL
             int "Maximum segment lifetime (MSL)"
             default 60000
             help
                 Set maximum segment lifetime in in milliseconds.
 
-        config TCP_SND_BUF_DEFAULT
+        config LWIP_TCP_SND_BUF_DEFAULT
             int "Default send buffer size"
             default 5744  # 4 * default MSS
             range 2440 65535
@@ -325,7 +325,7 @@ menu "LWIP"
                 Setting a smaller default SNDBUF size can save some RAM, but
                 will decrease performance.
 
-        config TCP_WND_DEFAULT
+        config LWIP_TCP_WND_DEFAULT
             int "Default receive window size"
             default 5744 # 4 * default MSS
             range 2440 65535
@@ -338,27 +338,27 @@ menu "LWIP"
                 Setting a smaller default receive window size can save some RAM,
                 but will significantly decrease performance.
 
-        config TCP_RECVMBOX_SIZE
+        config LWIP_TCP_RECVMBOX_SIZE
             int "Default TCP receive mail box size"
             default 6
             range 6 64
             help
                 Set TCP receive mail box size. Generally bigger value means higher throughput
-                but more memory. The recommended value is: TCP_WND_DEFAULT/TCP_MSS + 2, e.g. if
-                TCP_WND_DEFAULT=14360, TCP_MSS=1436, then the recommended receive mail box size is
+                but more memory. The recommended value is: LWIP_TCP_WND_DEFAULT/TCP_MSS + 2, e.g. if
+                LWIP_TCP_WND_DEFAULT=14360, TCP_MSS=1436, then the recommended receive mail box size is
                 (14360/1436 + 2) = 12.
 
                 TCP receive mail box is a per socket mail box, when the application receives packets
                 from TCP socket, LWIP core firstly posts the packets to TCP receive mail box and the
                 application then fetches the packets from mail box. It means LWIP can caches maximum
-                TCP_RECCVMBOX_SIZE packets for each TCP socket, so the maximum possible cached TCP packets
-                for all TCP sockets is TCP_RECCVMBOX_SIZE multiples the maximum TCP socket number. In other
-                words, the bigger TCP_RECVMBOX_SIZE means more memory.
+                LWIP_TCP_RECCVMBOX_SIZE packets for each TCP socket, so the maximum possible cached TCP packets
+                for all TCP sockets is LWIP_TCP_RECCVMBOX_SIZE multiples the maximum TCP socket number. In other
+                words, the bigger LWIP_TCP_RECVMBOX_SIZE means more memory.
                 On the other hand, if the receiv mail box is too small, the mail box may be full. If the
                 mail box is full, the LWIP drops the packets. So generally we need to make sure the TCP
                 receive mail box is big enough to avoid packet drop between LWIP core and application.
 
-        config TCP_QUEUE_OOSEQ
+        config LWIP_TCP_QUEUE_OOSEQ
             bool "Queue incoming out-of-order segments"
             default y
             help
@@ -367,7 +367,7 @@ menu "LWIP"
                 Disable this option to save some RAM during TCP sessions, at the expense
                 of increased retransmissions if segments arrive out of order.
 
-        config ESP_TCP_KEEP_CONNECTION_WHEN_IP_CHANGES
+        config LWIP_TCP_KEEP_CONNECTION_WHEN_IP_CHANGES
             bool "Keep TCP connections when IP changed"
             default n
             help
@@ -377,9 +377,9 @@ menu "LWIP"
                 Disable this option to keep consistent with the original LWIP code behavior.
 
 
-        choice TCP_OVERSIZE
+        choice LWIP_TCP_OVERSIZE
             prompt "Pre-allocate transmit PBUF size"
-            default TCP_OVERSIZE_MSS
+            default LWIP_TCP_OVERSIZE_MSS
             help
                 Allows enabling "oversize" allocation of TCP transmission pbufs ahead of time,
                 which can reduce the length of pbuf chains used for transmission.
@@ -392,11 +392,11 @@ menu "LWIP"
                 have worst performance and fragmentation characteristics, but uses
                 least RAM overall.
 
-            config TCP_OVERSIZE_MSS
+            config LWIP_TCP_OVERSIZE_MSS
                 bool "MSS"
-            config TCP_OVERSIZE_QUARTER_MSS
+            config LWIP_TCP_OVERSIZE_QUARTER_MSS
                 bool "25% MSS"
-            config TCP_OVERSIZE_DISABLE
+            config LWIP_TCP_OVERSIZE_DISABLE
                 bool "Disabled"
 
         endchoice
@@ -415,7 +415,7 @@ menu "LWIP"
                 The practical maximum limit is determined by available
                 heap memory at runtime.
 
-        config UDP_RECVMBOX_SIZE
+        config LWIP_UDP_RECVMBOX_SIZE
             int "Default UDP receive mail box size"
             default 6
             range 6 64
@@ -434,7 +434,7 @@ menu "LWIP"
 
     endmenu # UDP
 
-    config TCPIP_TASK_STACK_SIZE
+    config LWIP_TCPIP_TASK_STACK_SIZE
         int "TCP/IP Task Stack Size"
         default 3072
         # for high log levels, tcpip_adapter API calls can end up
@@ -445,32 +445,32 @@ menu "LWIP"
             Configure TCP/IP task stack size, used by LWIP to process multi-threaded TCP/IP operations.
             Setting this stack too small will result in stack overflow crashes.
 
-    choice TCPIP_TASK_AFFINITY
+    choice LWIP_TCPIP_TASK_AFFINITY
         prompt "TCP/IP task affinity"
-        default TCPIP_TASK_AFFINITY_NO_AFFINITY
+        default LWIP_TCPIP_TASK_AFFINITY_NO_AFFINITY
         help
             Allows setting LwIP tasks affinity, i.e. whether the task is pinned to
             CPU0, pinned to CPU1, or allowed to run on any CPU.
             Currently this applies to "TCP/IP" task and "Ping" task.
 
-        config TCPIP_TASK_AFFINITY_NO_AFFINITY
+        config LWIP_TCPIP_TASK_AFFINITY_NO_AFFINITY
             bool "No affinity"
-        config TCPIP_TASK_AFFINITY_CPU0
+        config LWIP_TCPIP_TASK_AFFINITY_CPU0
             bool "CPU0"
-        config TCPIP_TASK_AFFINITY_CPU1
+        config LWIP_TCPIP_TASK_AFFINITY_CPU1
             bool "CPU1"
             depends on !FREERTOS_UNICORE
 
     endchoice
 
-    config TCPIP_TASK_AFFINITY
+    config LWIP_TCPIP_TASK_AFFINITY
         hex
-        default FREERTOS_NO_AFFINITY if TCPIP_TASK_AFFINITY_NO_AFFINITY
-        default 0x0 if TCPIP_TASK_AFFINITY_CPU0
-        default 0x1 if TCPIP_TASK_AFFINITY_CPU1
+        default FREERTOS_NO_AFFINITY if LWIP_TCPIP_TASK_AFFINITY_NO_AFFINITY
+        default 0x0 if LWIP_TCPIP_TASK_AFFINITY_CPU0
+        default 0x1 if LWIP_TCPIP_TASK_AFFINITY_CPU1
 
 
-    menuconfig PPP_SUPPORT
+    menuconfig LWIP_PPP_SUPPORT
         bool "Enable PPP support (new/experimental)"
         default n
         help
@@ -478,44 +478,44 @@ menu "LWIP"
 
             PPP over serial support is experimental and unsupported.
 
-    config PPP_NOTIFY_PHASE_SUPPORT
+    config LWIP_PPP_NOTIFY_PHASE_SUPPORT
         bool "Enable Notify Phase Callback"
-        depends on PPP_SUPPORT
+        depends on LWIP_PPP_SUPPORT
         default n
         help
             Enable to set a callback which is called on change of the internal PPP state machine.
 
-    config PPP_PAP_SUPPORT
+    config LWIP_PPP_PAP_SUPPORT
         bool "Enable PAP support"
-        depends on PPP_SUPPORT
+        depends on LWIP_PPP_SUPPORT
         default n
         help
             Enable Password Authentication Protocol (PAP) support
 
-    config PPP_CHAP_SUPPORT
+    config LWIP_PPP_CHAP_SUPPORT
         bool "Enable CHAP support"
-        depends on PPP_SUPPORT
+        depends on LWIP_PPP_SUPPORT
         default n
         help
             Enable Challenge Handshake Authentication Protocol (CHAP) support
 
-    config PPP_MSCHAP_SUPPORT
+    config LWIP_PPP_MSCHAP_SUPPORT
         bool "Enable MSCHAP support"
-        depends on PPP_SUPPORT
+        depends on LWIP_PPP_SUPPORT
         default n
         help
             Enable Microsoft version of the Challenge-Handshake Authentication Protocol (MSCHAP) support
 
-    config PPP_MPPE_SUPPORT
+    config LWIP_PPP_MPPE_SUPPORT
         bool "Enable MPPE support"
-        depends on PPP_SUPPORT
+        depends on LWIP_PPP_SUPPORT
         default n
         help
             Enable Microsoft Point-to-Point Encryption (MPPE) support
 
-    config PPP_DEBUG_ON
+    config LWIP_PPP_DEBUG_ON
         bool "Enable PPP debug log output"
-        depends on PPP_SUPPORT
+        depends on LWIP_PPP_SUPPORT
         default n
         help
             Enable PPP debug log output

+ 1 - 1
components/lwip/component.mk

@@ -25,7 +25,7 @@ COMPONENT_SRCDIRS := \
 	port/esp32/netif \
 	port/esp32/debug
 
-ifdef CONFIG_PPP_SUPPORT
+ifdef CONFIG_LWIP_PPP_SUPPORT
     COMPONENT_SRCDIRS += lwip/src/netif/ppp lwip/src/netif/ppp/polarssl
 endif
 

+ 1 - 1
components/lwip/port/esp32/freertos/sys_arch.c

@@ -412,7 +412,7 @@ sys_thread_new(const char *name, lwip_thread_fn thread, void *arg, int stacksize
   portBASE_TYPE result;
 
   result = xTaskCreatePinnedToCore(thread, name, stacksize, arg, prio, &created_task,
-          CONFIG_TCPIP_TASK_AFFINITY);
+          CONFIG_LWIP_TCPIP_TASK_AFFINITY);
 
   if (result != pdPASS) {
     return NULL;

+ 25 - 25
components/lwip/port/esp32/include/lwipopts.h

@@ -309,36 +309,36 @@
  * TCP_QUEUE_OOSEQ==1: TCP will queue segments that arrive out of order.
  * Define to 0 if your device is low on memory.
  */
-#define TCP_QUEUE_OOSEQ                 CONFIG_TCP_QUEUE_OOSEQ
+#define TCP_QUEUE_OOSEQ                 CONFIG_LWIP_TCP_QUEUE_OOSEQ
 
 /**
  * ESP_TCP_KEEP_CONNECTION_WHEN_IP_CHANGES==1: Keep TCP connection when IP changed
  * scenario happens: 192.168.0.2 -> 0.0.0.0 -> 192.168.0.2 or 192.168.0.2 -> 0.0.0.0
  */
 
-#define ESP_TCP_KEEP_CONNECTION_WHEN_IP_CHANGES  CONFIG_ESP_TCP_KEEP_CONNECTION_WHEN_IP_CHANGES
+#define ESP_TCP_KEEP_CONNECTION_WHEN_IP_CHANGES  CONFIG_LWIP_TCP_KEEP_CONNECTION_WHEN_IP_CHANGES
 /*
  *     LWIP_EVENT_API==1: The user defines lwip_tcp_event() to receive all
  *         events (accept, sent, etc) that happen in the system.
  *     LWIP_CALLBACK_API==1: The PCB callback function is called directly
  *         for the event. This is the default.
 */
-#define TCP_MSS                         CONFIG_TCP_MSS
+#define TCP_MSS                         CONFIG_LWIP_TCP_MSS
 
 /**
  * TCP_MSL: The maximum segment lifetime in milliseconds
  */
-#define TCP_MSL                         CONFIG_TCP_MSL
+#define TCP_MSL                         CONFIG_LWIP_TCP_MSL
 
 /**
  * TCP_MAXRTX: Maximum number of retransmissions of data segments.
  */
-#define TCP_MAXRTX                      CONFIG_TCP_MAXRTX
+#define TCP_MAXRTX                      CONFIG_LWIP_TCP_MAXRTX
 
 /**
  * TCP_SYNMAXRTX: Maximum number of retransmissions of SYN segments.
  */
-#define TCP_SYNMAXRTX                   CONFIG_TCP_SYNMAXRTX
+#define TCP_SYNMAXRTX                   CONFIG_LWIP_TCP_SYNMAXRTX
 
 /**
  * TCP_LISTEN_BACKLOG: Enable the backlog option for tcp listen pcb.
@@ -350,13 +350,13 @@
  * TCP_OVERSIZE: The maximum number of bytes that tcp_write may
  * allocate ahead of time
  */
-#ifdef CONFIG_TCP_OVERSIZE_MSS
+#ifdef CONFIG_LWIP_TCP_OVERSIZE_MSS
 #define TCP_OVERSIZE                    TCP_MSS
 #endif
-#ifdef CONFIG_TCP_OVERSIZE_QUARTER_MSS
+#ifdef CONFIG_LWIP_TCP_OVERSIZE_QUARTER_MSS
 #define TCP_OVERSIZE                    (TCP_MSS/4)
 #endif
-#ifdef CONFIG_TCP_OVERSIZE_DISABLE
+#ifdef CONFIG_LWIP_TCP_OVERSIZE_DISABLE
 #define TCP_OVERSIZE                    0
 #endif
 #ifndef TCP_OVERSIZE
@@ -446,21 +446,21 @@
  * The queue size value itself is platform-dependent, but is passed to
  * sys_mbox_new() when tcpip_init is called.
  */
-#define TCPIP_MBOX_SIZE                 CONFIG_TCPIP_RECVMBOX_SIZE
+#define TCPIP_MBOX_SIZE                 CONFIG_LWIP_TCPIP_RECVMBOX_SIZE
 
 /**
  * DEFAULT_UDP_RECVMBOX_SIZE: The mailbox size for the incoming packets on a
  * NETCONN_UDP. The queue size value itself is platform-dependent, but is passed
  * to sys_mbox_new() when the recvmbox is created.
  */
-#define DEFAULT_UDP_RECVMBOX_SIZE       CONFIG_UDP_RECVMBOX_SIZE
+#define DEFAULT_UDP_RECVMBOX_SIZE       CONFIG_LWIP_UDP_RECVMBOX_SIZE
 
 /**
  * DEFAULT_TCP_RECVMBOX_SIZE: The mailbox size for the incoming packets on a
  * NETCONN_TCP. The queue size value itself is platform-dependent, but is passed
  * to sys_mbox_new() when the recvmbox is created.
  */
-#define DEFAULT_TCP_RECVMBOX_SIZE       CONFIG_TCP_RECVMBOX_SIZE
+#define DEFAULT_TCP_RECVMBOX_SIZE       CONFIG_LWIP_TCP_RECVMBOX_SIZE
 
 /**
  * DEFAULT_ACCEPTMBOX_SIZE: The mailbox size for the incoming connections.
@@ -572,34 +572,34 @@
 /**
  * PPP_SUPPORT==1: Enable PPP.
  */
-#define PPP_SUPPORT                     CONFIG_PPP_SUPPORT
+#define PPP_SUPPORT                     CONFIG_LWIP_PPP_SUPPORT
 
 #if PPP_SUPPORT
 
 /**
  * PPP_NOTIFY_PHASE==1: Support PPP notify phase.
  */
-#define PPP_NOTIFY_PHASE                CONFIG_PPP_NOTIFY_PHASE_SUPPORT
+#define PPP_NOTIFY_PHASE                CONFIG_LWIP_PPP_NOTIFY_PHASE_SUPPORT
 
 /**
  * PAP_SUPPORT==1: Support PAP.
  */
-#define PAP_SUPPORT                     CONFIG_PPP_PAP_SUPPORT
+#define PAP_SUPPORT                     CONFIG_LWIP_PPP_PAP_SUPPORT
 
 /**
  * CHAP_SUPPORT==1: Support CHAP.
  */
-#define CHAP_SUPPORT                    CONFIG_PPP_CHAP_SUPPORT
+#define CHAP_SUPPORT                    CONFIG_LWIP_PPP_CHAP_SUPPORT
 
 /**
  * MSCHAP_SUPPORT==1: Support MSCHAP.
  */
-#define MSCHAP_SUPPORT                  CONFIG_PPP_MSCHAP_SUPPORT
+#define MSCHAP_SUPPORT                  CONFIG_LWIP_PPP_MSCHAP_SUPPORT
 
 /**
  * CCP_SUPPORT==1: Support CCP.
  */
-#define MPPE_SUPPORT                    CONFIG_PPP_MPPE_SUPPORT
+#define MPPE_SUPPORT                    CONFIG_LWIP_PPP_MPPE_SUPPORT
 
 /**
  * PPP_MAXIDLEFLAG: Max Xmit idle time (in ms) before resend flag char.
@@ -614,7 +614,7 @@
 /**
  * PPP_DEBUG: Enable debugging for PPP.
  */
-#define PPP_DEBUG_ON					CONFIG_PPP_DEBUG_ON
+#define PPP_DEBUG_ON                    CONFIG_LWIP_PPP_DEBUG_ON
 
 #if PPP_DEBUG_ON
 #define PPP_DEBUG                       LWIP_DBG_ON
@@ -749,7 +749,7 @@
 #define ESP_RANDOM_TCP_PORT             1
 #define ESP_IP4_ATON                    1
 #define ESP_LIGHT_SLEEP                 1
-#define ESP_L2_TO_L3_COPY               CONFIG_L2_TO_L3_COPY
+#define ESP_L2_TO_L3_COPY               CONFIG_LWIP_L2_TO_L3_COPY
 #define ESP_STATS_MEM                   CONFIG_LWIP_STATS
 #define ESP_STATS_DROP                  CONFIG_LWIP_STATS
 #define ESP_STATS_TCP                   0
@@ -759,7 +759,7 @@
 #define ESP_PING                        1
 #define ESP_HAS_SELECT                  1
 #define ESP_AUTO_RECV                   1
-#define ESP_GRATUITOUS_ARP              CONFIG_ESP_GRATUITOUS_ARP
+#define ESP_GRATUITOUS_ARP              CONFIG_LWIP_ESP_GRATUITOUS_ARP
 
 #ifdef ESP_IRAM_ATTR
 #undef ESP_IRAM_ATTR
@@ -790,12 +790,12 @@ enum {
 #define DBG_PERF_FILTER_LEN             1000
 #endif
 
-#define TCP_SND_BUF                     CONFIG_TCP_SND_BUF_DEFAULT
-#define TCP_WND                         CONFIG_TCP_WND_DEFAULT
+#define TCP_SND_BUF                     CONFIG_LWIP_TCP_SND_BUF_DEFAULT
+#define TCP_WND                         CONFIG_LWIP_TCP_WND_DEFAULT
 
 #if ESP_PER_SOC_TCP_WND
-#define TCP_WND_DEFAULT                 CONFIG_TCP_WND_DEFAULT
-#define TCP_SND_BUF_DEFAULT             CONFIG_TCP_SND_BUF_DEFAULT
+#define TCP_WND_DEFAULT                 CONFIG_LWIP_TCP_WND_DEFAULT
+#define TCP_SND_BUF_DEFAULT             CONFIG_LWIP_TCP_SND_BUF_DEFAULT
 #define TCP_WND(pcb)                    (pcb->per_soc_tcp_wnd)
 #define TCP_SND_BUF(pcb)                (pcb->per_soc_tcp_snd_buf)
 #define TCP_SND_QUEUELEN(pcb)           ((4 * (TCP_SND_BUF((pcb))) + (TCP_MSS - 1))/(TCP_MSS))

+ 39 - 0
components/lwip/sdkconfig.rename

@@ -0,0 +1,39 @@
+# sdkconfig replacement configurations for deprecated options formatted as
+# CONFIG_DEPRECATED_OPTION CONFIG_NEW_OPTION
+
+CONFIG_L2_TO_L3_COPY                            CONFIG_LWIP_L2_TO_L3_COPY
+CONFIG_USE_ONLY_LWIP_SELECT                     CONFIG_LWIP_USE_ONLY_LWIP_SELECT
+CONFIG_ESP_GRATUITOUS_ARP                       CONFIG_LWIP_ESP_GRATUITOUS_ARP
+CONFIG_GARP_TMR_INTERVAL                        CONFIG_LWIP_GARP_TMR_INTERVAL
+CONFIG_TCPIP_RECVMBOX_SIZE                      CONFIG_LWIP_TCPIP_RECVMBOX_SIZE
+
+# TCP
+CONFIG_TCP_MAXRTX                               CONFIG_LWIP_TCP_MAXRTX
+CONFIG_TCP_SYNMAXRTX                            CONFIG_LWIP_TCP_SYNMAXRTX
+CONFIG_TCP_MSS                                  CONFIG_LWIP_TCP_MSS
+CONFIG_TCP_MSL                                  CONFIG_LWIP_TCP_MSL
+CONFIG_TCP_SND_BUF_DEFAULT                      CONFIG_LWIP_TCP_SND_BUF_DEFAULT
+CONFIG_TCP_WND_DEFAULT                          CONFIG_LWIP_TCP_WND_DEFAULT
+CONFIG_TCP_RECVMBOX_SIZE                        CONFIG_LWIP_TCP_RECVMBOX_SIZE
+CONFIG_TCP_QUEUE_OOSEQ                          CONFIG_LWIP_TCP_QUEUE_OOSEQ
+CONFIG_ESP_TCP_KEEP_CONNECTION_WHEN_IP_CHANGES  CONFIG_LWIP_TCP_KEEP_CONNECTION_WHEN_IP_CHANGES
+CONFIG_TCP_OVERSIZE                             CONFIG_LWIP_TCP_OVERSIZE
+CONFIG_TCP_OVERSIZE_MSS                         CONFIG_LWIP_TCP_OVERSIZE_MSS
+CONFIG_TCP_OVERSIZE_QUARTER_MSS                 CONFIG_LWIP_TCP_OVERSIZE_QUARTER_MSS
+CONFIG_TCP_OVERSIZE_DISABLE                     CONFIG_LWIP_TCP_OVERSIZE_DISABLE
+
+# UDP
+CONFIG_UDP_RECVMBOX_SIZE                        CONFIG_LWIP_UDP_RECVMBOX_SIZE
+
+CONFIG_TCPIP_TASK_STACK_SIZE                    CONFIG_LWIP_TCPIP_TASK_STACK_SIZE
+CONFIG_TCPIP_TASK_AFFINITY                      CONFIG_LWIP_TCPIP_TASK_AFFINITY
+CONFIG_TCPIP_TASK_AFFINITY_NO_AFFINITY          CONFIG_LWIP_TCPIP_TASK_AFFINITY_NO_AFFINITY
+CONFIG_TCPIP_TASK_AFFINITY_CPU0                 CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU0
+CONFIG_TCPIP_TASK_AFFINITY_CPU1                 CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU1
+CONFIG_PPP_SUPPORT                              CONFIG_LWIP_PPP_SUPPORT
+CONFIG_PPP_NOTIFY_PHASE_SUPPORT                 CONFIG_LWIP_PPP_NOTIFY_PHASE_SUPPORT
+CONFIG_PPP_PAP_SUPPORT                          CONFIG_LWIP_PPP_PAP_SUPPORT
+CONFIG_PPP_CHAP_SUPPORT                         CONFIG_LWIP_PPP_CHAP_SUPPORT
+CONFIG_PPP_MSCHAP_SUPPORT                       CONFIG_LWIP_PPP_MSCHAP_SUPPORT
+CONFIG_PPP_MPPE_SUPPORT                         CONFIG_LWIP_PPP_MPPE_SUPPORT
+CONFIG_PPP_DEBUG_ON                             CONFIG_LWIP_PPP_DEBUG_ON

+ 3 - 3
components/newlib/select.c

@@ -16,7 +16,7 @@
 #include "esp_vfs.h"
 #include "sdkconfig.h"
 
-#ifdef CONFIG_USE_ONLY_LWIP_SELECT
+#ifdef CONFIG_LWIP_USE_ONLY_LWIP_SELECT
 #include "lwip/sockets.h"
 
 #ifdef CONFIG_SUPPRESS_SELECT_DEBUG_OUTPUT
@@ -37,11 +37,11 @@ static void log_fd_set(const char *fds_name, const fd_set *fds)
         }
     }
 }
-#endif //CONFIG_USE_ONLY_LWIP_SELECT
+#endif //CONFIG_LWIP_USE_ONLY_LWIP_SELECT
 
 int select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *errorfds, struct timeval *timeout)
 {
-#ifdef CONFIG_USE_ONLY_LWIP_SELECT
+#ifdef CONFIG_LWIP_USE_ONLY_LWIP_SELECT
     ESP_LOGD(TAG, "lwip_select starts with nfds = %d", nfds);
     if (timeout) {
         ESP_LOGD(TAG, "timeout is %lds + %ldus", timeout->tv_sec, timeout->tv_usec);

+ 1 - 1
components/vfs/README.rst

@@ -94,7 +94,7 @@ are the :example:`peripherals/uart_select` and the :example:`system/select`
 examples.
 
 If :cpp:func:`select` is used for socket file descriptors only then one can
-enable the :envvar:`CONFIG_USE_ONLY_LWIP_SELECT` option which can reduce the code
+enable the :envvar:`CONFIG_LWIP_USE_ONLY_LWIP_SELECT` option which can reduce the code
 size and improve performance.
 
 Paths

+ 4 - 4
examples/protocols/pppos_client/sdkconfig.defaults

@@ -1,5 +1,5 @@
 # Override some defaults to enable PPP
-CONFIG_PPP_SUPPORT=y
-CONFIG_PPP_NOTIFY_PHASE_SUPPORT=y
-CONFIG_PPP_PAP_SUPPORT=y
-CONFIG_TCPIP_TASK_STACK_SIZE=4096
+CONFIG_LWIP_PPP_SUPPORT=y
+CONFIG_LWIP_PPP_NOTIFY_PHASE_SUPPORT=y
+CONFIG_LWIP_PPP_PAP_SUPPORT=y
+CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=4096

+ 5 - 5
examples/wifi/iperf/sdkconfig.defaults

@@ -18,11 +18,11 @@ CONFIG_FREERTOS_HZ=1000
 CONFIG_INT_WDT=n
 CONFIG_TASK_WDT=n
 
-CONFIG_TCP_SND_BUF_DEFAULT=65534
-CONFIG_TCP_WND_DEFAULT=65534
-CONFIG_TCP_RECVMBOX_SIZE=64
-CONFIG_UDP_RECVMBOX_SIZE=64
-CONFIG_TCPIP_RECVMBOX_SIZE=64
+CONFIG_LWIP_TCP_SND_BUF_DEFAULT=65534
+CONFIG_LWIP_TCP_WND_DEFAULT=65534
+CONFIG_LWIP_TCP_RECVMBOX_SIZE=64
+CONFIG_LWIP_UDP_RECVMBOX_SIZE=64
+CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=64
 CONFIG_LWIP_ETHARP_TRUST_IP_MAC=n
 
 CONFIG_FLASHMODE_QIO=y

+ 5 - 5
examples/wifi/iperf/sdkconfig.defaults.01

@@ -16,10 +16,10 @@ CONFIG_ESP32_WIFI_TX_BA_WIN=12
 CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
 CONFIG_ESP32_WIFI_RX_BA_WIN=12
 
-CONFIG_TCP_SND_BUF_DEFAULT=11488
-CONFIG_TCP_WND_DEFAULT=11488
-CONFIG_TCP_RECVMBOX_SIZE=12
-CONFIG_UDP_RECVMBOX_SIZE=12
-CONFIG_TCPIP_RECVMBOX_SIZE=48
+CONFIG_LWIP_TCP_SND_BUF_DEFAULT=11488
+CONFIG_LWIP_TCP_WND_DEFAULT=11488
+CONFIG_LWIP_TCP_RECVMBOX_SIZE=12
+CONFIG_LWIP_UDP_RECVMBOX_SIZE=12
+CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=48
 CONFIG_LWIP_ETHARP_TRUST_IP_MAC=
 

+ 5 - 5
examples/wifi/iperf/sdkconfig.defaults.02

@@ -16,10 +16,10 @@ CONFIG_ESP32_WIFI_TX_BA_WIN=32
 CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
 CONFIG_ESP32_WIFI_RX_BA_WIN=32
 
-CONFIG_TCP_SND_BUF_DEFAULT=11488
-CONFIG_TCP_WND_DEFAULT=11488
-CONFIG_TCP_RECVMBOX_SIZE=12
-CONFIG_UDP_RECVMBOX_SIZE=12
-CONFIG_TCPIP_RECVMBOX_SIZE=48
+CONFIG_LWIP_TCP_SND_BUF_DEFAULT=11488
+CONFIG_LWIP_TCP_WND_DEFAULT=11488
+CONFIG_LWIP_TCP_RECVMBOX_SIZE=12
+CONFIG_LWIP_UDP_RECVMBOX_SIZE=12
+CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=48
 CONFIG_LWIP_ETHARP_TRUST_IP_MAC=
 

+ 5 - 5
examples/wifi/iperf/sdkconfig.defaults.03

@@ -16,10 +16,10 @@ CONFIG_ESP32_WIFI_TX_BA_WIN=32
 CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
 CONFIG_ESP32_WIFI_RX_BA_WIN=32
 
-CONFIG_TCP_SND_BUF_DEFAULT=32768
-CONFIG_TCP_WND_DEFAULT=32768
-CONFIG_TCP_RECVMBOX_SIZE=64
-CONFIG_UDP_RECVMBOX_SIZE=64
-CONFIG_TCPIP_RECVMBOX_SIZE=64
+CONFIG_LWIP_TCP_SND_BUF_DEFAULT=32768
+CONFIG_LWIP_TCP_WND_DEFAULT=32768
+CONFIG_LWIP_TCP_RECVMBOX_SIZE=64
+CONFIG_LWIP_UDP_RECVMBOX_SIZE=64
+CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=64
 CONFIG_LWIP_ETHARP_TRUST_IP_MAC=
 

+ 5 - 5
examples/wifi/iperf/sdkconfig.defaults.04

@@ -16,10 +16,10 @@ CONFIG_ESP32_WIFI_TX_BA_WIN=32
 CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
 CONFIG_ESP32_WIFI_RX_BA_WIN=32
 
-CONFIG_TCP_SND_BUF_DEFAULT=65535
-CONFIG_TCP_WND_DEFAULT=65535
-CONFIG_TCP_RECVMBOX_SIZE=64
-CONFIG_UDP_RECVMBOX_SIZE=64
-CONFIG_TCPIP_RECVMBOX_SIZE=64
+CONFIG_LWIP_TCP_SND_BUF_DEFAULT=65535
+CONFIG_LWIP_TCP_WND_DEFAULT=65535
+CONFIG_LWIP_TCP_RECVMBOX_SIZE=64
+CONFIG_LWIP_UDP_RECVMBOX_SIZE=64
+CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=64
 CONFIG_LWIP_ETHARP_TRUST_IP_MAC=
 

+ 5 - 5
examples/wifi/iperf/sdkconfig.defaults.05

@@ -16,11 +16,11 @@ CONFIG_ESP32_WIFI_TX_BA_WIN=32
 CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
 CONFIG_ESP32_WIFI_RX_BA_WIN=32
 
-CONFIG_TCP_SND_BUF_DEFAULT=65534
-CONFIG_TCP_WND_DEFAULT=65534
-CONFIG_TCP_RECVMBOX_SIZE=64
-CONFIG_UDP_RECVMBOX_SIZE=64
-CONFIG_TCPIP_RECVMBOX_SIZE=64
+CONFIG_LWIP_TCP_SND_BUF_DEFAULT=65534
+CONFIG_LWIP_TCP_WND_DEFAULT=65534
+CONFIG_LWIP_TCP_RECVMBOX_SIZE=64
+CONFIG_LWIP_UDP_RECVMBOX_SIZE=64
+CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=64
 CONFIG_LWIP_ETHARP_TRUST_IP_MAC=
 
 CONFIG_FLASHMODE_QIO=y

+ 5 - 5
examples/wifi/iperf/sdkconfig.defaults.06

@@ -14,11 +14,11 @@ CONFIG_FREERTOS_HZ=1000
 CONFIG_INT_WDT=
 CONFIG_TASK_WDT=
 
-CONFIG_TCP_SND_BUF_DEFAULT=65534
-CONFIG_TCP_WND_DEFAULT=65534
-CONFIG_TCP_RECVMBOX_SIZE=64
-CONFIG_UDP_RECVMBOX_SIZE=64
-CONFIG_TCPIP_RECVMBOX_SIZE=64
+CONFIG_LWIP_TCP_SND_BUF_DEFAULT=65534
+CONFIG_LWIP_TCP_WND_DEFAULT=65534
+CONFIG_LWIP_TCP_RECVMBOX_SIZE=64
+CONFIG_LWIP_UDP_RECVMBOX_SIZE=64
+CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=64
 CONFIG_LWIP_ETHARP_TRUST_IP_MAC=
 
 CONFIG_FLASHMODE_QIO=y

+ 5 - 5
examples/wifi/iperf/sdkconfig.defaults.07

@@ -18,11 +18,11 @@ CONFIG_FREERTOS_HZ=1000
 CONFIG_INT_WDT=
 CONFIG_TASK_WDT=
 
-CONFIG_TCP_SND_BUF_DEFAULT=65534
-CONFIG_TCP_WND_DEFAULT=65534
-CONFIG_TCP_RECVMBOX_SIZE=64
-CONFIG_UDP_RECVMBOX_SIZE=64
-CONFIG_TCPIP_RECVMBOX_SIZE=64
+CONFIG_LWIP_TCP_SND_BUF_DEFAULT=65534
+CONFIG_LWIP_TCP_WND_DEFAULT=65534
+CONFIG_LWIP_TCP_RECVMBOX_SIZE=64
+CONFIG_LWIP_UDP_RECVMBOX_SIZE=64
+CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=64
 CONFIG_LWIP_ETHARP_TRUST_IP_MAC=
 
 CONFIG_FLASHMODE_QIO=y

+ 5 - 5
examples/wifi/iperf/sdkconfig.defaults.99

@@ -18,11 +18,11 @@ CONFIG_FREERTOS_HZ=1000
 CONFIG_INT_WDT=
 CONFIG_TASK_WDT=
 
-CONFIG_TCP_SND_BUF_DEFAULT=65534
-CONFIG_TCP_WND_DEFAULT=65534
-CONFIG_TCP_RECVMBOX_SIZE=64
-CONFIG_UDP_RECVMBOX_SIZE=64
-CONFIG_TCPIP_RECVMBOX_SIZE=64
+CONFIG_LWIP_TCP_SND_BUF_DEFAULT=65534
+CONFIG_LWIP_TCP_WND_DEFAULT=65534
+CONFIG_LWIP_TCP_RECVMBOX_SIZE=64
+CONFIG_LWIP_UDP_RECVMBOX_SIZE=64
+CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=64
 CONFIG_LWIP_ETHARP_TRUST_IP_MAC=
 
 CONFIG_FLASHMODE_QIO=y

+ 16 - 16
tools/ldgen/samples/sdkconfig

@@ -339,7 +339,7 @@ CONFIG_LOG_COLORS=y
 #
 # LWIP
 #
-CONFIG_L2_TO_L3_COPY=
+CONFIG_LWIP_L2_TO_L3_COPY=
 CONFIG_LWIP_IRAM_OPTIMIZATION=
 CONFIG_LWIP_MAX_SOCKETS=4
 CONFIG_LWIP_SO_REUSE=
@@ -349,7 +349,7 @@ CONFIG_LWIP_IP_FRAG=
 CONFIG_LWIP_IP_REASSEMBLY=
 CONFIG_LWIP_STATS=
 CONFIG_LWIP_ETHARP_TRUST_IP_MAC=y
-CONFIG_TCPIP_RECVMBOX_SIZE=32
+CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32
 CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y
 
 #
@@ -366,25 +366,25 @@ CONFIG_LWIP_LOOPBACK_MAX_PBUFS=8
 #
 CONFIG_LWIP_MAX_ACTIVE_TCP=16
 CONFIG_LWIP_MAX_LISTENING_TCP=16
-CONFIG_TCP_MAXRTX=12
-CONFIG_TCP_SYNMAXRTX=6
-CONFIG_TCP_MSS=1436
-CONFIG_TCP_MSL=60000
-CONFIG_TCP_SND_BUF_DEFAULT=5744
-CONFIG_TCP_WND_DEFAULT=5744
-CONFIG_TCP_RECVMBOX_SIZE=6
-CONFIG_TCP_QUEUE_OOSEQ=y
-CONFIG_TCP_OVERSIZE_MSS=y
-CONFIG_TCP_OVERSIZE_QUARTER_MSS=
-CONFIG_TCP_OVERSIZE_DISABLE=
+CONFIG_LWIP_TCP_MAXRTX=12
+CONFIG_LWIP_TCP_SYNMAXRTX=6
+CONFIG_LWIP_TCP_MSS=1436
+CONFIG_LWIP_TCP_MSL=60000
+CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5744
+CONFIG_LWIP_TCP_WND_DEFAULT=5744
+CONFIG_LWIP_TCP_RECVMBOX_SIZE=6
+CONFIG_LWIP_TCP_QUEUE_OOSEQ=y
+CONFIG_LWIP_TCP_OVERSIZE_MSS=y
+CONFIG_LWIP_TCP_OVERSIZE_QUARTER_MSS=
+CONFIG_LWIP_TCP_OVERSIZE_DISABLE=
 
 #
 # UDP
 #
 CONFIG_LWIP_MAX_UDP_PCBS=16
-CONFIG_UDP_RECVMBOX_SIZE=6
-CONFIG_TCPIP_TASK_STACK_SIZE=2048
-CONFIG_PPP_SUPPORT=
+CONFIG_LWIP_UDP_RECVMBOX_SIZE=6
+CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=2048
+CONFIG_LWIP_PPP_SUPPORT=
 
 #
 # ICMP