espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-05-21 00:56:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'revert-a633993f' into 'master'

Browse Source 
Revert "Merge branch 'feature/optimize_dhcp_proc' into 'master'"

See merge request sdk/ESP8266_RTOS_SDK!1560
This commit is contained in:
Dong Heng
2020-11-16 16:42:35 +08:00
parent b597124bcb 0733e41ca0
commit b921e0c3a4
1 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
components/tcpip_adapter/tcpip_adapter_lwip.c
View File

@ -88,7 +88,6 @@ void system_station_got_ip_set();
static int dhcp_fail_time = 0;
static tcpip_adapter_ip_info_t esp_ip[TCPIP_ADAPTER_IF_MAX];
static TimerHandle_t *dhcp_check_timer;
static wifi_ps_type_t s_ps_type;
static void tcpip_adapter_dhcps_cb(u8_t client_ip[4])
{
@ -309,8 +308,6 @@ static void tcpip_adapter_dhcpc_done(TimerHandle_t xTimer)
|| (autoip && autoip->state == AUTOIP_STATE_ANNOUNCING)
#endif
) {
esp_wifi_set_ps(s_ps_type);
/*send event here*/
tcpip_adapter_dhcpc_cb(esp_netif[TCPIP_ADAPTER_IF_STA]);
ESP_LOGD(TAG,"ip:" IPSTR ",mask:" IPSTR ",gw:" IPSTR "\n", IP2STR(ip_2_ip4(&(esp_netif[0]->ip_addr))),
@ -321,14 +318,10 @@ static void tcpip_adapter_dhcpc_done(TimerHandle_t xTimer)
dhcp_fail_time ++;
xTimerReset(dhcp_check_timer, 0);
} else {
esp_wifi_set_ps(s_ps_type);
dhcp_fail_time = 0;
ESP_LOGD(TAG,"ERROR dhcp get ip error\n");
}
} else {
esp_wifi_set_ps(s_ps_type);
dhcp_fail_time = 0;
tcpip_adapter_release_dhcp(esp_netif[TCPIP_ADAPTER_IF_STA]);
@ -1160,8 +1153,6 @@ esp_err_t tcpip_adapter_dhcpc_start(tcpip_adapter_if_t tcpip_if)
#endif
if (p_netif != NULL) {
wifi_ps_type_t ps;
if (netif_is_up(p_netif)) {
ESP_LOGD(TAG, "dhcp client init ip/mask/gw to all-0");
ip_addr_set_zero(&p_netif->ip_addr);
@ -1174,16 +1165,9 @@ esp_err_t tcpip_adapter_dhcpc_start(tcpip_adapter_if_t tcpip_if)
return ESP_OK;
}
esp_wifi_get_ps(&ps);
esp_wifi_set_ps(WIFI_PS_NONE);
if (tcpip_adapter_start_dhcp(p_netif) != ERR_OK) {
esp_wifi_set_ps(ps);
ESP_LOGD(TAG, "dhcp client start failed");
return ESP_ERR_TCPIP_ADAPTER_DHCPC_START_FAILED;
} else {
s_ps_type = ps;
}
dhcp_fail_time = 0;