]> granicus.if.org Git - esp-idf/commitdiff
dhcp: fix dhcp err when wifi and ethernet coexist
authorshangke <shangke@espressif.com>
Tue, 10 Jan 2017 13:54:53 +0000 (21:54 +0800)
committershangke <shangke@espressif.com>
Tue, 10 Jan 2017 13:54:53 +0000 (21:54 +0800)
components/tcpip_adapter/tcpip_adapter_lwip.c

index 03f364fe67353f65943e528d47e34e9b8795603e..b2725e3447f8b49b67cb32ddb2e48d94a0540bf7 100644 (file)
@@ -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) ||