From e05cdc69a0e95b2262a4bb01ed7915c3d33af3ff Mon Sep 17 00:00:00 2001
From: tangyuxin <462747508@qq.com>
Date: Wed, 17 Oct 2018 17:44:32 +0800
Subject: [PATCH] [components][net] dhcpd Support LWIP2.0 and LWIP1.4

---
 components/net/lwip_dhcpd/dhcp_server.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/net/lwip_dhcpd/dhcp_server.c b/components/net/lwip_dhcpd/dhcp_server.c
index 47717fb894..3f0e7a6daf 100644
--- a/components/net/lwip_dhcpd/dhcp_server.c
+++ b/components/net/lwip_dhcpd/dhcp_server.c
@@ -222,11 +222,12 @@ static void dhcpd_thread_entry(void *parameter)
     {
 #if (LWIP_VERSION) >= 0x02000000U
         ip4_addr_t addr;
+        ip4addr_aton(DHCPD_SERVER_IP, &addr);
 #else
         struct ip_addr addr;
+        ipaddr_aton(DHCPD_SERVER_IP, &addr);
 #endif /* LWIP_VERSION */
 
-        ip4addr_aton(DHCPD_SERVER_IP, &addr);
         DHCPD_SERVER_IPADDR0 = (ntohl(addr.addr) >> 24) & 0xFF;
         DHCPD_SERVER_IPADDR1 = (ntohl(addr.addr) >> 16) & 0xFF;
         DHCPD_SERVER_IPADDR2 = (ntohl(addr.addr) >>  8) & 0xFF;
-- 
GitLab