From 8c6646da4def13a8a28754cdce3587155782bb58 Mon Sep 17 00:00:00 2001 From: Dong Heng Date: Mon, 27 Apr 2020 12:22:49 +0800 Subject: [PATCH] Revert "Merge branch 'bugfix/fix_addr_changed_when_wifi_disconnect' into 'master'" This reverts merge request !1372 --- components/tcpip_adapter/tcpip_adapter_lwip.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/components/tcpip_adapter/tcpip_adapter_lwip.c b/components/tcpip_adapter/tcpip_adapter_lwip.c index 787b8e62..091e88dc 100644 --- a/components/tcpip_adapter/tcpip_adapter_lwip.c +++ b/components/tcpip_adapter/tcpip_adapter_lwip.c @@ -449,7 +449,9 @@ esp_err_t tcpip_adapter_up(tcpip_adapter_if_t tcpip_if) return ESP_ERR_TCPIP_ADAPTER_IF_NOT_READY; } - esp_netif[tcpip_if]->flags |= NETIF_FLAG_UP; + /* use last obtained ip, or static ip */ + netif_set_addr(esp_netif[tcpip_if], &esp_ip[tcpip_if].ip, &esp_ip[tcpip_if].netmask, &esp_ip[tcpip_if].gw); + netif_set_up(esp_netif[tcpip_if]); } tcpip_adapter_update_default_netif(); @@ -480,7 +482,9 @@ esp_err_t tcpip_adapter_down(tcpip_adapter_if_t tcpip_if) tcpip_adapter_reset_ip_info(tcpip_if); } - esp_netif[tcpip_if]->flags &= ~NETIF_FLAG_UP; + netif_set_addr(esp_netif[tcpip_if], IP4_ADDR_ANY4, IP4_ADDR_ANY4, IP4_ADDR_ANY4); + netif_set_down(esp_netif[tcpip_if]); + tcpip_adapter_start_ip_lost_timer(tcpip_if); } tcpip_adapter_update_default_netif();