diff --git a/components/lwip/Kconfig b/components/lwip/Kconfig
index 9d1d7561d3..5b2e6398ce 100644
--- a/components/lwip/Kconfig
+++ b/components/lwip/Kconfig
@@ -540,6 +540,7 @@ menu "LWIP"
         config LWIP_TCP_SACK_OUT
             bool "Support sending selective acknowledgements"
             default n
+            depends on LWIP_TCP_QUEUE_OOSEQ
             help
                 TCP will support sending selective acknowledgements (SACKs).
 
diff --git a/components/lwip/port/esp32/include/lwipopts.h b/components/lwip/port/esp32/include/lwipopts.h
index 9dc70286d9..89f7210645 100644
--- a/components/lwip/port/esp32/include/lwipopts.h
+++ b/components/lwip/port/esp32/include/lwipopts.h
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * SPDX-FileContributor: 2015-2021 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileContributor: 2015-2022 Espressif Systems (Shanghai) CO LTD
  */
 #ifndef LWIP_HDR_ESP_LWIPOPTS_H
 #define LWIP_HDR_ESP_LWIPOPTS_H
diff --git a/components/lwip/sdkconfig.rename b/components/lwip/sdkconfig.rename
index da63c8e079..527363f64b 100644
--- a/components/lwip/sdkconfig.rename
+++ b/components/lwip/sdkconfig.rename
@@ -15,7 +15,6 @@ 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
diff --git a/components/vfs/vfs.c b/components/vfs/vfs.c
index ad38c0edd4..27986e7af3 100644
--- a/components/vfs/vfs.c
+++ b/components/vfs/vfs.c
@@ -23,7 +23,7 @@
 
 // Warn about using deprecated option
 #ifdef CONFIG_LWIP_USE_ONLY_LWIP_SELECT
-#warning LWIP_USE_ONLY_LWIP_SELECT is deprecated: Please use VFS_SUPPORT_SELECT instead
+#warning CONFIG_LWIP_USE_ONLY_LWIP_SELECT is deprecated: Please use CONFIG_VFS_SUPPORT_SELECT instead
 #endif
 
 #ifdef CONFIG_VFS_SUPPRESS_SELECT_DEBUG_OUTPUT
diff --git a/tools/ci/check_copyright_config.yaml b/tools/ci/check_copyright_config.yaml
index 80cfd5e6d6..29d1dabb63 100644
--- a/tools/ci/check_copyright_config.yaml
+++ b/tools/ci/check_copyright_config.yaml
@@ -79,3 +79,4 @@ ignore:
     - '!components/bt/host/bluedroid/api/'
     - '!components/bt/host/bluedroid/btc/'
     - examples/zigbee/
+    - components/lwip/port/esp32/include/lwipopts.h