From 57880c7a41cea354f0a2ef4ece826c587ac9528a Mon Sep 17 00:00:00 2001
From: Zhang Jun Hao <zhangjunhao@espressif.com>
Date: Tue, 1 May 2018 13:26:52 +0800
Subject: [PATCH] feat(esp8266): Change ip_addr/ip_addr_t to
 ip4_addr/ip4_addr_t

---
 components/esp8266/include/esp_misc.h   |  4 ++--
 components/esp8266/include/esp_softap.h |  2 +-
 components/esp8266/include/esp_wifi.h   | 12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/components/esp8266/include/esp_misc.h b/components/esp8266/include/esp_misc.h
index 5f46d9f1..9470ec6b 100644
--- a/components/esp8266/include/esp_misc.h
+++ b/components/esp8266/include/esp_misc.h
@@ -87,8 +87,8 @@ enum dhcp_status {
 
 struct dhcps_lease {
     bool enable;                /**< enable DHCP lease or not */
-    struct ip_addr start_ip;    /**< start IP of IP range */
-    struct ip_addr end_ip;      /**< end IP of IP range */
+    struct ip4_addr start_ip;    /**< start IP of IP range */
+    struct ip4_addr end_ip;      /**< end IP of IP range */
 };
 
 enum dhcps_offer_option {
diff --git a/components/esp8266/include/esp_softap.h b/components/esp8266/include/esp_softap.h
index 38810ea2..d2b3e9b1 100644
--- a/components/esp8266/include/esp_softap.h
+++ b/components/esp8266/include/esp_softap.h
@@ -63,7 +63,7 @@ struct station_info {
     STAILQ_ENTRY(station_info)     next;    /**< Information of next AP */
 
     uint8 bssid[6];                         /**< BSSID of AP */
-    struct ip_addr ip;                      /**< IP address of AP */
+    struct ip4_addr ip;                      /**< IP address of AP */
 };
 
 /**
diff --git a/components/esp8266/include/esp_wifi.h b/components/esp8266/include/esp_wifi.h
index 5ec95eda..2349e284 100644
--- a/components/esp8266/include/esp_wifi.h
+++ b/components/esp8266/include/esp_wifi.h
@@ -142,9 +142,9 @@ typedef enum {
 } WIFI_INTERFACE;
 
 struct ip_info {
-    struct ip_addr ip;      /**< IP address */
-    struct ip_addr netmask; /**< netmask */
-    struct ip_addr gw;      /**< gateway */
+    struct ip4_addr ip;      /**< IP address */
+    struct ip4_addr netmask; /**< netmask */
+    struct ip4_addr gw;      /**< gateway */
 };
 
 /**
@@ -327,9 +327,9 @@ typedef struct {
 } Event_StaMode_AuthMode_Change_t;
 
 typedef struct {
-    struct ip_addr ip;      /**< IP address that ESP8266 station got from connected AP */
-    struct ip_addr mask;    /**< netmask that ESP8266 station got from connected AP */
-    struct ip_addr gw;      /**< gateway that ESP8266 station got from connected AP */
+    struct ip4_addr ip;      /**< IP address that ESP8266 station got from connected AP */
+    struct ip4_addr mask;    /**< netmask that ESP8266 station got from connected AP */
+    struct ip4_addr gw;      /**< gateway that ESP8266 station got from connected AP */
 } Event_StaMode_Got_IP_t;
 
 typedef struct {