diff --git a/components/lwip/lwip b/components/lwip/lwip
index 104e8fa4c8..358ee481e5 160000
--- a/components/lwip/lwip
+++ b/components/lwip/lwip
@@ -1 +1 @@
-Subproject commit 104e8fa4c881a98eefa3776d2701a6b90b9aa63d
+Subproject commit 358ee481e5bcd399b77ddb21d41edb499d3bc820
diff --git a/components/lwip/port/esp32/include/lwipopts.h b/components/lwip/port/esp32/include/lwipopts.h
index ee1bf8030b..c539cbe0c7 100644
--- a/components/lwip/port/esp32/include/lwipopts.h
+++ b/components/lwip/port/esp32/include/lwipopts.h
@@ -27,6 +27,10 @@
 #include "sntp/sntp_get_set_time.h"
 #include "sockets_ext.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
    -----------------------------------------------
    ---------- Platform specific locking ----------
@@ -1444,4 +1448,8 @@ static inline uint32_t timeout_from_offered(uint32_t lease, uint32_t min)
 #define mem_clib_calloc calloc
 #endif /* CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* LWIP_HDR_ESP_LWIPOPTS_H */
diff --git a/components/lwip/test_afl_host/esp32_mock.c b/components/lwip/test_afl_host/esp32_mock.c
index 9a7c38a5cd..960da97462 100644
--- a/components/lwip/test_afl_host/esp32_mock.c
+++ b/components/lwip/test_afl_host/esp32_mock.c
@@ -301,3 +301,11 @@ uint32_t esp_random(void)
     // Preparation for injecting favorable random numbers
     return g_random_numbers[g_random_numbers_cnt++ % 8];
 }
+
+void dhcp_parse_extra_opts(struct dhcp *dhcp, uint8_t state, uint8_t option, uint8_t len, struct pbuf* p, uint16_t offset)
+{
+}
+
+void dhcp_append_extra_opts(struct netif *netif, uint8_t state, struct dhcp_msg *msg_out, uint16_t *options_out_len)
+{
+}
diff --git a/components/lwip/test_afl_host/sdkconfig.defaults b/components/lwip/test_afl_host/sdkconfig.defaults
index ec02309aec..81952aa5bb 100644
--- a/components/lwip/test_afl_host/sdkconfig.defaults
+++ b/components/lwip/test_afl_host/sdkconfig.defaults
@@ -1 +1,2 @@
 CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES=n
+CONFIG_FREERTOS_SMP=n