Merge branch 'fix/netif_ppp_dhcp_v5.4' into 'release/v5.4'

fix(esp_netif): Fix incorrect DHCP call for PPP interfaces (v5.4)

See merge request espressif/esp-idf!40239
This commit is contained in:
Jiang Jiang Jian
2025-07-10 11:27:33 +08:00

View File

@@ -1387,7 +1387,14 @@ static void esp_netif_internal_dhcpc_cb(struct netif *netif)
ESP_LOGE(TAG, "dhcpc cb: failed to post got ip event (%x)", ret); ESP_LOGE(TAG, "dhcpc cb: failed to post got ip event (%x)", ret);
} }
#ifdef CONFIG_LWIP_DHCP_RESTORE_LAST_IP #ifdef CONFIG_LWIP_DHCP_RESTORE_LAST_IP
/*
* Store the IP address only for non-Point-to-Point interfaces.
* P2P interfaces (like PPP) have dynamic addressing that shouldn't be stored
* for later restoration, as they're negotiated on each connection.
*/
if (!_IS_NETIF_ANY_POINT2POINT_TYPE(esp_netif)) {
dhcp_ip_addr_store(netif); dhcp_ip_addr_store(netif);
}
#endif /* CONFIG_LWIP_DHCP_RESTORE_LAST_IP */ #endif /* CONFIG_LWIP_DHCP_RESTORE_LAST_IP */
} else { } else {
ESP_LOGD(TAG, "if%p ip unchanged", esp_netif); ESP_LOGD(TAG, "if%p ip unchanged", esp_netif);