From 2e06c6ba382cda6313441b46610a30be17153b56 Mon Sep 17 00:00:00 2001 From: shangke Date: Tue, 10 Jan 2017 21:54:53 +0800 Subject: [PATCH] dhcp: fix dhcp err when wifi and ethernet coexist --- components/tcpip_adapter/tcpip_adapter_lwip.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/components/tcpip_adapter/tcpip_adapter_lwip.c b/components/tcpip_adapter/tcpip_adapter_lwip.c index 03f364fe6..b2725e344 100644 --- a/components/tcpip_adapter/tcpip_adapter_lwip.c +++ b/components/tcpip_adapter/tcpip_adapter_lwip.c @@ -529,7 +529,12 @@ static void tcpip_adapter_dhcpc_cb(struct netif *netif) } if ( !ip4_addr_cmp(ip_2_ip4(&netif->ip_addr), IP4_ADDR_ANY) ) { - tcpip_adapter_ip_info_t *ip_info = &esp_ip[TCPIP_ADAPTER_IF_STA]; + tcpip_adapter_ip_info_t *ip_info = NULL; + if( netif == esp_netif[TCPIP_ADAPTER_IF_STA] ) { + ip_info = &esp_ip[TCPIP_ADAPTER_IF_STA]; + } else if(netif == esp_netif[TCPIP_ADAPTER_IF_ETH] ) { + ip_info = &esp_ip[TCPIP_ADAPTER_IF_ETH]; + } //check whether IP is changed if ( !ip4_addr_cmp(ip_2_ip4(&netif->ip_addr), &ip_info->ip) ||