From d7fe25682154aff00ec08c0fa23a4dc7dde514f4 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Fri, 4 Jul 2014 19:13:08 -0600
Subject: [PATCH] NET: emoved all includes of uip.h; added includes of ip.h
 wherever needed.  Tried to fix problems of the now missing sneak inclusions
 because uip.h was removed.  There are probably a few of these that were
 missed.

---
 arch/arm/src/c5471/c5471_ethernet.c      | 5 +++--
 arch/arm/src/kinetis/kinetis_enet.c      | 3 ++-
 arch/arm/src/lpc17xx/lpc17_ethernet.c    | 3 ++-
 arch/arm/src/sam34/sam_emac.c            | 2 ++
 arch/arm/src/sama5/sam_emaca.c           | 2 ++
 arch/arm/src/sama5/sam_emacb.c           | 2 ++
 arch/arm/src/sama5/sam_gmac.c            | 2 ++
 arch/arm/src/stm32/stm32_eth.c           | 2 ++
 arch/arm/src/tiva/tiva_ethernet.c        | 2 ++
 arch/hc/src/m9s12/m9s12_ethernet.c       | 3 ++-
 arch/mips/src/pic32mx/pic32mx-ethernet.c | 3 ++-
 arch/sim/src/up_wpcap.c                  | 3 +++
 arch/z80/src/ez80/ez80_emac.c            | 7 ++++---
 13 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/arch/arm/src/c5471/c5471_ethernet.c b/arch/arm/src/c5471/c5471_ethernet.c
index fe79c0e90d..36b79a9d38 100644
--- a/arch/arm/src/c5471/c5471_ethernet.c
+++ b/arch/arm/src/c5471/c5471_ethernet.c
@@ -54,10 +54,11 @@
 #include <wdog.h>
 #include <errno.h>
 
+#include <arpa/inet.h>
+#include <net/ethernet.h>
+
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-
-#include <net/ethernet.h>
 #include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 
diff --git a/arch/arm/src/kinetis/kinetis_enet.c b/arch/arm/src/kinetis/kinetis_enet.c
index 407228c842..8b46150a17 100644
--- a/arch/arm/src/kinetis/kinetis_enet.c
+++ b/arch/arm/src/kinetis/kinetis_enet.c
@@ -49,10 +49,11 @@
 #include <wdog.h>
 #include <errno.h>
 
+#include <arpa/inet.h>
+
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <nuttx/net/mii.h>
-
 #include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 
diff --git a/arch/arm/src/lpc17xx/lpc17_ethernet.c b/arch/arm/src/lpc17xx/lpc17_ethernet.c
index 08dc10c4e5..1b726da2a9 100644
--- a/arch/arm/src/lpc17xx/lpc17_ethernet.c
+++ b/arch/arm/src/lpc17xx/lpc17_ethernet.c
@@ -48,10 +48,11 @@
 #include <wdog.h>
 #include <errno.h>
 
+#include <arpa/inet.h>
+
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <nuttx/net/mii.h>
-
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
diff --git a/arch/arm/src/sam34/sam_emac.c b/arch/arm/src/sam34/sam_emac.c
index aaeeefeb67..dc881c605c 100644
--- a/arch/arm/src/sam34/sam_emac.c
+++ b/arch/arm/src/sam34/sam_emac.c
@@ -59,6 +59,8 @@
 #include <queue.h>
 #include <errno.h>
 
+#include <arpa/inet.h>
+
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <nuttx/kmalloc.h>
diff --git a/arch/arm/src/sama5/sam_emaca.c b/arch/arm/src/sama5/sam_emaca.c
index 2daf5f48a6..e4149c131f 100644
--- a/arch/arm/src/sama5/sam_emaca.c
+++ b/arch/arm/src/sama5/sam_emaca.c
@@ -60,6 +60,8 @@
 #include <queue.h>
 #include <errno.h>
 
+#include <arpa/inet.h>
+
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <nuttx/kmalloc.h>
diff --git a/arch/arm/src/sama5/sam_emacb.c b/arch/arm/src/sama5/sam_emacb.c
index a7567e794c..fb06788c5d 100644
--- a/arch/arm/src/sama5/sam_emacb.c
+++ b/arch/arm/src/sama5/sam_emacb.c
@@ -74,6 +74,8 @@
 #include <queue.h>
 #include <errno.h>
 
+#include <arpa/inet.h>
+
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <nuttx/kmalloc.h>
diff --git a/arch/arm/src/sama5/sam_gmac.c b/arch/arm/src/sama5/sam_gmac.c
index 1aef6a032a..8e2e4f8f1a 100644
--- a/arch/arm/src/sama5/sam_gmac.c
+++ b/arch/arm/src/sama5/sam_gmac.c
@@ -57,6 +57,8 @@
 #include <queue.h>
 #include <errno.h>
 
+#include <arpa/inet.h>
+
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <nuttx/kmalloc.h>
diff --git a/arch/arm/src/stm32/stm32_eth.c b/arch/arm/src/stm32/stm32_eth.c
index 082ebfd979..64aa3d39ae 100644
--- a/arch/arm/src/stm32/stm32_eth.c
+++ b/arch/arm/src/stm32/stm32_eth.c
@@ -49,6 +49,8 @@
 #include <queue.h>
 #include <errno.h>
 
+#include <arpa/inet.h>
+
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <nuttx/net/mii.h>
diff --git a/arch/arm/src/tiva/tiva_ethernet.c b/arch/arm/src/tiva/tiva_ethernet.c
index f1ebd70548..e200f7d751 100644
--- a/arch/arm/src/tiva/tiva_ethernet.c
+++ b/arch/arm/src/tiva/tiva_ethernet.c
@@ -48,6 +48,8 @@
 #include <wdog.h>
 #include <errno.h>
 
+#include <arpa/inet.h>
+
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
diff --git a/arch/hc/src/m9s12/m9s12_ethernet.c b/arch/hc/src/m9s12/m9s12_ethernet.c
index 1c98c8d87b..b658760105 100644
--- a/arch/hc/src/m9s12/m9s12_ethernet.c
+++ b/arch/hc/src/m9s12/m9s12_ethernet.c
@@ -48,9 +48,10 @@
 #include <wdog.h>
 #include <errno.h>
 
+#include <arpa/inet.h>
+
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-
 #include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 
diff --git a/arch/mips/src/pic32mx/pic32mx-ethernet.c b/arch/mips/src/pic32mx/pic32mx-ethernet.c
index 91ddb93c68..ecc9e16979 100644
--- a/arch/mips/src/pic32mx/pic32mx-ethernet.c
+++ b/arch/mips/src/pic32mx/pic32mx-ethernet.c
@@ -51,10 +51,11 @@
 #include <errno.h>
 #include <assert.h>
 
+#include <arpa/inet.h>
+
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <nuttx/net/mii.h>
-
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
diff --git a/arch/sim/src/up_wpcap.c b/arch/sim/src/up_wpcap.c
index 87f376e703..dabbe0dab0 100644
--- a/arch/sim/src/up_wpcap.c
+++ b/arch/sim/src/up_wpcap.c
@@ -54,6 +54,9 @@
 #include <stdlib.h>
 #include <malloc.h>
 
+#include <netinet/in.h>
+
+
 extern int netdriver_setmacaddr(unsigned char *macaddr);
 
 /****************************************************************************
diff --git a/arch/z80/src/ez80/ez80_emac.c b/arch/z80/src/ez80/ez80_emac.c
index a4777ed501..7f0ba5757e 100644
--- a/arch/z80/src/ez80/ez80_emac.c
+++ b/arch/z80/src/ez80/ez80_emac.c
@@ -52,15 +52,16 @@
 #include <errno.h>
 #include <assert.h>
 
+#include <arpa/inet.h>
+
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <nuttx/net/mii.h>
-
-#include <arch/io.h>
-
 #include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
 
+#include <arch/io.h>
+
 #include "chip.h"
 #include "up_internal.h"