Move include/nuttx/net/uip/uip-arch.h to include/nuttx/net/netdev.h

79 files changed, 84 insertions, 84 deletions

diff --git a/apps/examples/thttpd/content/netstat/netstat.c b/apps/examples/thttpd/content/netstat/netstat.c
index dda7dfb2d..0124e5393 100644
--- a/apps/examples/thttpd/content/netstat/netstat.c
+++ b/apps/examples/thttpd/content/netstat/netstat.c
@@ -45,7 +45,7 @@
 
 #include <netinet/ether.h>
 #include <nuttx/net/netconfig.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/apps/nshlib/nsh_netcmds.c b/apps/nshlib/nsh_netcmds.c
index 7d58ded5d..b8e90b933 100644
--- a/apps/nshlib/nsh_netcmds.c
+++ b/apps/nshlib/nsh_netcmds.c
@@ -60,7 +60,7 @@
 #include <nuttx/net/net.h>
 #include <nuttx/clock.h>
 #include <nuttx/net/uip/uip.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #ifdef CONFIG_NET_STATISTICS
 #  include <nuttx/net/uip/uip.h>
diff --git a/nuttx/Documentation/NuttxPortingGuide.html b/nuttx/Documentation/NuttxPortingGuide.html
index ee7913447..b156c1137 100644
--- a/nuttx/Documentation/NuttxPortingGuide.html
+++ b/nuttx/Documentation/NuttxPortingGuide.html
@@ -2924,7 +2924,7 @@ void board_led_off(int led);
 <ul>
   <li>
     <p>
-    <b><code>include/nuttx/net/uip/uip-arch.h</code></b>.
+    <b><code>include/nuttx/net/netdev.h</code></b>.
     All structures and APIs needed to work with Ethernet drivers are provided in this header file.
     The structure <code>struct uip_driver_s</code> defines the interface and is passed to uIP via
     <code>netdev_register()</code>.
diff --git a/nuttx/arch/arm/src/c5471/c5471_ethernet.c b/nuttx/arch/arm/src/c5471/c5471_ethernet.c
index 4a6ff9bde..6d35231ab 100644
--- a/nuttx/arch/arm/src/c5471/c5471_ethernet.c
+++ b/nuttx/arch/arm/src/c5471/c5471_ethernet.c
@@ -60,7 +60,7 @@
 #include <net/ethernet.h>
 #include <nuttx/net/uip/uip.h>
 #include <nuttx/net/arp.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "chip.h"
 #include "up_arch.h"
diff --git a/nuttx/arch/arm/src/kinetis/kinetis_enet.c b/nuttx/arch/arm/src/kinetis/kinetis_enet.c
index 025dcc2e6..10d58e838 100644
--- a/nuttx/arch/arm/src/kinetis/kinetis_enet.c
+++ b/nuttx/arch/arm/src/kinetis/kinetis_enet.c
@@ -55,7 +55,7 @@
 
 #include <nuttx/net/uip/uip.h>
 #include <nuttx/net/arp.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "up_arch.h"
 #include "chip.h"
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c b/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c
index cea75f4ab..ee3fd5bfb 100644
--- a/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c
+++ b/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c
@@ -55,7 +55,7 @@
 #include <nuttx/net/uip/uip.h>
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/arp.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "up_arch.h"
 #include "chip.h"
diff --git a/nuttx/arch/arm/src/sam34/sam_emac.c b/nuttx/arch/arm/src/sam34/sam_emac.c
index 5424fcf0f..da1647ddc 100644
--- a/nuttx/arch/arm/src/sam34/sam_emac.c
+++ b/nuttx/arch/arm/src/sam34/sam_emac.c
@@ -65,7 +65,7 @@
 #include <nuttx/net/mii.h>
 #include <nuttx/net/uip/uip.h>
 #include <nuttx/net/arp.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "up_arch.h"
 #include "up_internal.h"
diff --git a/nuttx/arch/arm/src/sama5/sam_emaca.c b/nuttx/arch/arm/src/sama5/sam_emaca.c
index f2cc702df..315f68d21 100644
--- a/nuttx/arch/arm/src/sama5/sam_emaca.c
+++ b/nuttx/arch/arm/src/sama5/sam_emaca.c
@@ -66,7 +66,7 @@
 #include <nuttx/net/mii.h>
 #include <nuttx/net/uip/uip.h>
 #include <nuttx/net/arp.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "up_arch.h"
 #include "up_internal.h"
diff --git a/nuttx/arch/arm/src/sama5/sam_emacb.c b/nuttx/arch/arm/src/sama5/sam_emacb.c
index 9891ee407..3e80ba685 100644
--- a/nuttx/arch/arm/src/sama5/sam_emacb.c
+++ b/nuttx/arch/arm/src/sama5/sam_emacb.c
@@ -73,7 +73,7 @@
 #include <nuttx/net/mii.h>
 #include <nuttx/net/uip/uip.h>
 #include <nuttx/net/arp.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "up_arch.h"
 #include "up_internal.h"
diff --git a/nuttx/arch/arm/src/sama5/sam_gmac.c b/nuttx/arch/arm/src/sama5/sam_gmac.c
index 096405573..3318cb45c 100644
--- a/nuttx/arch/arm/src/sama5/sam_gmac.c
+++ b/nuttx/arch/arm/src/sama5/sam_gmac.c
@@ -63,7 +63,7 @@
 #include <nuttx/net/gmii.h>
 #include <nuttx/net/uip/uip.h>
 #include <nuttx/net/arp.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "up_arch.h"
 #include "up_internal.h"
diff --git a/nuttx/arch/arm/src/stm32/stm32_eth.c b/nuttx/arch/arm/src/stm32/stm32_eth.c
index cded4edb3..8797c6472 100644
--- a/nuttx/arch/arm/src/stm32/stm32_eth.c
+++ b/nuttx/arch/arm/src/stm32/stm32_eth.c
@@ -55,7 +55,7 @@
 
 #include <nuttx/net/uip/uip.h>
 #include <nuttx/net/arp.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 #if defined(CONFIG_NET_PKT)
 #  include <nuttx/net/uip/uip-pkt.h>
 #endif
diff --git a/nuttx/arch/arm/src/tiva/tiva_ethernet.c b/nuttx/arch/arm/src/tiva/tiva_ethernet.c
index a3a282111..091f445e4 100644
--- a/nuttx/arch/arm/src/tiva/tiva_ethernet.c
+++ b/nuttx/arch/arm/src/tiva/tiva_ethernet.c
@@ -53,7 +53,7 @@
 #include <arch/board/board.h>
 #include <nuttx/net/uip/uip.h>
 #include <nuttx/net/arp.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "chip.h"
 #include "up_arch.h"
diff --git a/nuttx/arch/hc/src/m9s12/m9s12_ethernet.c b/nuttx/arch/hc/src/m9s12/m9s12_ethernet.c
index 857469b28..c03395cf6 100644
--- a/nuttx/arch/hc/src/m9s12/m9s12_ethernet.c
+++ b/nuttx/arch/hc/src/m9s12/m9s12_ethernet.c
@@ -53,7 +53,7 @@
 
 #include <nuttx/net/uip/uip.h>
 #include <nuttx/net/arp.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c b/nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c
index de34dc2d7..9b2815b69 100644
--- a/nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c
+++ b/nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c
@@ -58,7 +58,7 @@
 #include <nuttx/net/uip/uip.h>
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/arp.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include <arch/irq.h>
 #include <arch/board/board.h>
diff --git a/nuttx/arch/sim/src/up_uipdriver.c b/nuttx/arch/sim/src/up_uipdriver.c
index 3bc0bf9df..255e3ad4f 100644
--- a/nuttx/arch/sim/src/up_uipdriver.c
+++ b/nuttx/arch/sim/src/up_uipdriver.c
@@ -54,7 +54,7 @@
 
 #include <net/ethernet.h>
 #include <nuttx/net/uip/uip.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 #include <nuttx/net/arp.h>
 
 #include "up_internal.h"
diff --git a/nuttx/arch/z80/src/ez80/ez80_emac.c b/nuttx/arch/z80/src/ez80/ez80_emac.c
index 5787303eb..11547ea48 100644
--- a/nuttx/arch/z80/src/ez80/ez80_emac.c
+++ b/nuttx/arch/z80/src/ez80/ez80_emac.c
@@ -60,7 +60,7 @@
 
 #include <nuttx/net/uip/uip.h>
 #include <nuttx/net/arp.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "chip.h"
 #include "up_internal.h"
diff --git a/nuttx/drivers/net/cs89x0.c b/nuttx/drivers/net/cs89x0.c
index 860830777..881be0d34 100644
--- a/nuttx/drivers/net/cs89x0.c
+++ b/nuttx/drivers/net/cs89x0.c
@@ -53,7 +53,7 @@
 
 #include <nuttx/net/uip/uip.h>
 #include <nuttx/net/arp.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/drivers/net/dm90x0.c b/nuttx/drivers/net/dm90x0.c
index 0f4fb0e49..d3d34283f 100644
--- a/nuttx/drivers/net/dm90x0.c
+++ b/nuttx/drivers/net/dm90x0.c
@@ -66,7 +66,7 @@
 #include <net/ethernet.h>
 #include <nuttx/net/uip/uip.h>
 #include <nuttx/net/arp.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/drivers/net/e1000.c b/nuttx/drivers/net/e1000.c
index 255bd01d1..d010c37a0 100644
--- a/nuttx/drivers/net/e1000.c
+++ b/nuttx/drivers/net/e1000.c
@@ -56,7 +56,7 @@
 
 #include <nuttx/net/uip/uip.h>
 #include <nuttx/net/arp.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include <rgmp/pmap.h>
 #include <rgmp/string.h>
diff --git a/nuttx/drivers/net/enc28j60.c b/nuttx/drivers/net/enc28j60.c
index 374821914..02ed7f32e 100644
--- a/nuttx/drivers/net/enc28j60.c
+++ b/nuttx/drivers/net/enc28j60.c
@@ -63,7 +63,7 @@
 
 #include <nuttx/net/uip/uip.h>
 #include <nuttx/net/arp.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "enc28j60.h"
 
diff --git a/nuttx/drivers/net/encx24j600.c b/nuttx/drivers/net/encx24j600.c
index 28c49469e..ee68f5cd3 100644
--- a/nuttx/drivers/net/encx24j600.c
+++ b/nuttx/drivers/net/encx24j600.c
@@ -69,7 +69,7 @@
 
 #include <nuttx/net/uip/uip.h>
 #include <nuttx/net/arp.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "encx24j600.h"
 
diff --git a/nuttx/drivers/net/skeleton.c b/nuttx/drivers/net/skeleton.c
index 6dd17958d..bdbffdc32 100644
--- a/nuttx/drivers/net/skeleton.c
+++ b/nuttx/drivers/net/skeleton.c
@@ -53,7 +53,7 @@
 
 #include <nuttx/net/uip/uip.h>
 #include <nuttx/net/arp.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/drivers/net/slip.c b/nuttx/drivers/net/slip.c
index 40456581e..734f3510a 100644
--- a/nuttx/drivers/net/slip.c
+++ b/nuttx/drivers/net/slip.c
@@ -58,7 +58,7 @@
 #include <nuttx/net/net.h>
 
 #include <nuttx/net/uip/uip.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #if defined(CONFIG_NET) && defined(CONFIG_NET_SLIP)
 
diff --git a/nuttx/drivers/net/vnet.c b/nuttx/drivers/net/vnet.c
index 671ece432..7f94ec33c 100644
--- a/nuttx/drivers/net/vnet.c
+++ b/nuttx/drivers/net/vnet.c
@@ -57,7 +57,7 @@
 
 #include <nuttx/net/uip/uip.h>
 #include <nuttx/net/arp.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include <rgmp/vnet.h>
 #include <rgmp/stdio.h>
diff --git a/nuttx/include/nuttx/net/net.h b/nuttx/include/nuttx/net/net.h
index 46858b8c5..c433d25b9 100644
--- a/nuttx/include/nuttx/net/net.h
+++ b/nuttx/include/nuttx/net/net.h
@@ -125,7 +125,7 @@ struct socketlist
 
 /* Callback from netdev_foreach() */
 
-struct uip_driver_s; /* Forward reference. Defined in nuttx/net/uip/uip-arch.h */
+struct uip_driver_s; /* Forward reference. Defined in nuttx/net/netdev.h */
 typedef int (*netdev_callback_t)(FAR struct uip_driver_s *dev, void *arg);
 
 /****************************************************************************
diff --git a/nuttx/include/nuttx/net/uip/uip-arch.h b/nuttx/include/nuttx/net/netdev.h
index 546fe4451..7f7733d2a 100644
--- a/nuttx/include/nuttx/net/uip/uip-arch.h
+++ b/nuttx/include/nuttx/net/netdev.h
@@ -1,8 +1,8 @@
 /****************************************************************************
- * include/nuttx/net/uip/uip-arch.h
- * Defines architecture-specific device driver interfaces to uIP
+ * include/nuttx/net/netdev.h
+ * Defines architecture-specific device driver interfaces to the uIP network.
  *
- *   Copyright (C) 2007, 2009, 2011-2013 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2011-2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Derived largely from portions of uIP with has a similar BSD-styple license:
@@ -39,8 +39,8 @@
  *
  ****************************************************************************/
 
-#ifndef __INCLUDE_NUTTX_NET_UIP_UIP_ARCH_H
-#define __INCLUDE_NUTTX_NET_UIP_UIP_ARCH_H
+#ifndef __INCLUDE_NUTTX_NET_NETDEV_H
+#define __INCLUDE_NUTTX_NET_NETDEV_H
 
 /****************************************************************************
  * Included Files
@@ -392,5 +392,5 @@ uint16_t uip_tcpchksum(struct uip_driver_s *dev);
 uint16_t uip_udpchksum(struct uip_driver_s *dev);
 uint16_t uip_icmpchksum(struct uip_driver_s *dev, int len);
 
-#endif /* __INCLUDE_NUTTX_NET_UIP_UIP_ARCH_H */
+#endif /* __INCLUDE_NUTTX_NET_NETDEV_H */
 
diff --git a/nuttx/include/nuttx/net/uip/uip-igmp.h b/nuttx/include/nuttx/net/uip/uip-igmp.h
index 3a6a13a5b..d3c021b66 100644
--- a/nuttx/include/nuttx/net/uip/uip-igmp.h
+++ b/nuttx/include/nuttx/net/uip/uip-igmp.h
@@ -55,7 +55,7 @@
 #include <netinet/in.h>
 
 #include <nuttx/net/uip/uip.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #ifdef CONFIG_NET_IGMP
 
diff --git a/nuttx/net/arp/arp_inout.c b/nuttx/net/arp/arp_inout.c
index 14963436a..0cf05063d 100644
--- a/nuttx/net/arp/arp_inout.c
+++ b/nuttx/net/arp/arp_inout.c
@@ -64,7 +64,7 @@
 
 #include <net/ethernet.h>
 #include <nuttx/net/netconfig.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 #include <nuttx/net/arp.h>
 
 #ifdef CONFIG_NET_ARP
diff --git a/nuttx/net/arp/arp_table.c b/nuttx/net/arp/arp_table.c
index ebf11e252..f72458013 100644
--- a/nuttx/net/arp/arp_table.c
+++ b/nuttx/net/arp/arp_table.c
@@ -54,7 +54,7 @@
 
 #include <net/ethernet.h>
 #include <nuttx/net/netconfig.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 #include <nuttx/net/arp.h>
 
 #ifdef CONFIG_NET_ARP
diff --git a/nuttx/net/connect.c b/nuttx/net/connect.c
index 73cb61bd4..9ffd4a15c 100644
--- a/nuttx/net/connect.c
+++ b/nuttx/net/connect.c
@@ -48,7 +48,7 @@
 #include <debug.h>
 
 #include <arch/irq.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "net_internal.h"
 #include "uip/uip_internal.h"
diff --git a/nuttx/net/getsockname.c b/nuttx/net/getsockname.c
index c5cae2f3b..fd5121308 100644
--- a/nuttx/net/getsockname.c
+++ b/nuttx/net/getsockname.c
@@ -46,7 +46,7 @@
 #include <errno.h>
 
 #include <nuttx/net/net.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "net_internal.h"
 
diff --git a/nuttx/net/icmp/icmp_input.c b/nuttx/net/icmp/icmp_input.c
index 8434e4ab1..83fe252a9 100644
--- a/nuttx/net/icmp/icmp_input.c
+++ b/nuttx/net/icmp/icmp_input.c
@@ -51,7 +51,7 @@
 #include <net/if.h>
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/uip/uip.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "uip/uip_internal.h"
 
diff --git a/nuttx/net/icmp/icmp_ping.c b/nuttx/net/icmp/icmp_ping.c
index 66f23cf79..9394a49ce 100644
--- a/nuttx/net/icmp/icmp_ping.c
+++ b/nuttx/net/icmp/icmp_ping.c
@@ -51,7 +51,7 @@
 #include <nuttx/clock.h>
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/uip/uip.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "uip/uip_internal.h"
 #include "../net_internal.h" /* Should not include this! */
diff --git a/nuttx/net/icmp/icmp_poll.c b/nuttx/net/icmp/icmp_poll.c
index 045facfb5..d3b6014c7 100644
--- a/nuttx/net/icmp/icmp_poll.c
+++ b/nuttx/net/icmp/icmp_poll.c
@@ -44,7 +44,7 @@
 
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/uip/uip.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "uip/uip_internal.h"
 
diff --git a/nuttx/net/icmp/icmp_send.c b/nuttx/net/icmp/icmp_send.c
index 8d6232d36..603a477f9 100644
--- a/nuttx/net/icmp/icmp_send.c
+++ b/nuttx/net/icmp/icmp_send.c
@@ -44,7 +44,7 @@
 
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/uip/uip.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "uip/uip_internal.h"
 
diff --git a/nuttx/net/igmp/igmp_poll.c b/nuttx/net/igmp/igmp_poll.c
index 55b94deb5..522826e29 100644
--- a/nuttx/net/igmp/igmp_poll.c
+++ b/nuttx/net/igmp/igmp_poll.c
@@ -48,7 +48,7 @@
 
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/uip/uip.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "uip/uip_internal.h"
 
diff --git a/nuttx/net/igmp/igmp_send.c b/nuttx/net/igmp/igmp_send.c
index dbcce795b..af7da4cfb 100644
--- a/nuttx/net/igmp/igmp_send.c
+++ b/nuttx/net/igmp/igmp_send.c
@@ -44,7 +44,7 @@
 
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/uip/uip.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 #include <nuttx/net/uip/uip-ipopt.h>
 #include <nuttx/net/uip/uip-igmp.h>
 
diff --git a/nuttx/net/net_close.c b/nuttx/net/net_close.c
index 33c13f495..f96724f0e 100644
--- a/nuttx/net/net_close.c
+++ b/nuttx/net/net_close.c
@@ -48,7 +48,7 @@
 #include <debug.h>
 
 #include <arch/irq.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #ifdef CONFIG_NET_SOLINGER
 #  include <nuttx/clock.h>
diff --git a/nuttx/net/net_sendfile.c b/nuttx/net/net_sendfile.c
index 124336b73..aaaefcce0 100644
--- a/nuttx/net/net_sendfile.c
+++ b/nuttx/net/net_sendfile.c
@@ -59,7 +59,7 @@
 #include <nuttx/clock.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/net/arp.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "net_internal.h"
 #include "uip/uip_internal.h"
diff --git a/nuttx/net/netdev_carrier.c b/nuttx/net/netdev_carrier.c
index b32c1d666..d0e59d996 100644
--- a/nuttx/net/netdev_carrier.c
+++ b/nuttx/net/netdev_carrier.c
@@ -50,7 +50,7 @@
 
 #include <net/if.h>
 #include <net/ethernet.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "net_internal.h"
 
diff --git a/nuttx/net/netdev_count.c b/nuttx/net/netdev_count.c
index 8db1191a2..4ee0612a5 100644
--- a/nuttx/net/netdev_count.c
+++ b/nuttx/net/netdev_count.c
@@ -43,7 +43,7 @@
 #include <string.h>
 #include <errno.h>
 
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "net_internal.h"
 
diff --git a/nuttx/net/netdev_findbyaddr.c b/nuttx/net/netdev_findbyaddr.c
index ae741197a..77bef5aaf 100644
--- a/nuttx/net/netdev_findbyaddr.c
+++ b/nuttx/net/netdev_findbyaddr.c
@@ -45,7 +45,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "net_route.h"
 #include "net_internal.h"
diff --git a/nuttx/net/netdev_findbyname.c b/nuttx/net/netdev_findbyname.c
index 9f6f895ac..c56971e2b 100644
--- a/nuttx/net/netdev_findbyname.c
+++ b/nuttx/net/netdev_findbyname.c
@@ -43,7 +43,7 @@
 #include <string.h>
 #include <errno.h>
 
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "net_internal.h"
 
diff --git a/nuttx/net/netdev_foreach.c b/nuttx/net/netdev_foreach.c
index f88444ad8..b3c4975f9 100644
--- a/nuttx/net/netdev_foreach.c
+++ b/nuttx/net/netdev_foreach.c
@@ -42,7 +42,7 @@
 
 #include <debug.h>
 #include <nuttx/net/net.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "net_internal.h"
 
diff --git a/nuttx/net/netdev_ioctl.c b/nuttx/net/netdev_ioctl.c
index c37c04611..eb0c6e523 100644
--- a/nuttx/net/netdev_ioctl.c
+++ b/nuttx/net/netdev_ioctl.c
@@ -55,7 +55,7 @@
 #include <net/ethernet.h>
 #include <netinet/in.h>
 
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 #include <nuttx/net/uip/uip.h>
 
 #ifdef CONFIG_NET_IGMP
diff --git a/nuttx/net/netdev_register.c b/nuttx/net/netdev_register.c
index 31cf884e4..e34f79232 100644
--- a/nuttx/net/netdev_register.c
+++ b/nuttx/net/netdev_register.c
@@ -50,7 +50,7 @@
 
 #include <net/if.h>
 #include <net/ethernet.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "net_internal.h"
 
diff --git a/nuttx/net/netdev_router.c b/nuttx/net/netdev_router.c
index a39f822b1..c0e32056d 100644
--- a/nuttx/net/netdev_router.c
+++ b/nuttx/net/netdev_router.c
@@ -43,7 +43,7 @@
 #include <string.h>
 #include <errno.h>
 
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "net_internal.h"
 #include "net_route.h"
diff --git a/nuttx/net/netdev_rxnotify.c b/nuttx/net/netdev_rxnotify.c
index f4352661b..ffacf061d 100644
--- a/nuttx/net/netdev_rxnotify.c
+++ b/nuttx/net/netdev_rxnotify.c
@@ -45,7 +45,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "net_internal.h"
 
diff --git a/nuttx/net/netdev_txnotify.c b/nuttx/net/netdev_txnotify.c
index fe4c1d3dd..9d8c69f9a 100644
--- a/nuttx/net/netdev_txnotify.c
+++ b/nuttx/net/netdev_txnotify.c
@@ -45,7 +45,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "net_internal.h"
 
diff --git a/nuttx/net/netdev_unregister.c b/nuttx/net/netdev_unregister.c
index 39927340a..7ce9af17a 100644
--- a/nuttx/net/netdev_unregister.c
+++ b/nuttx/net/netdev_unregister.c
@@ -50,7 +50,7 @@
 
 #include <net/if.h>
 #include <net/ethernet.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "net_internal.h"
 
diff --git a/nuttx/net/pkt/pkt_callback.c b/nuttx/net/pkt/pkt_callback.c
index 5bc84fdb2..679f46ef3 100644
--- a/nuttx/net/pkt/pkt_callback.c
+++ b/nuttx/net/pkt/pkt_callback.c
@@ -45,7 +45,7 @@
 
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/uip/uip.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "uip/uip_internal.h"
 
diff --git a/nuttx/net/pkt/pkt_conn.c b/nuttx/net/pkt/pkt_conn.c
index e52be6d48..30a20655d 100644
--- a/nuttx/net/pkt/pkt_conn.c
+++ b/nuttx/net/pkt/pkt_conn.c
@@ -52,7 +52,7 @@
 
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/uip/uip.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 #include <nuttx/net/arp.h>
 
 #include "uip/uip_internal.h"
diff --git a/nuttx/net/pkt/pkt_input.c b/nuttx/net/pkt/pkt_input.c
index 21690496e..227c388fb 100644
--- a/nuttx/net/pkt/pkt_input.c
+++ b/nuttx/net/pkt/pkt_input.c
@@ -48,7 +48,7 @@
 #include <debug.h>
 
 #include <nuttx/net/uip/uip.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 #include <nuttx/net/uip/uip-pkt.h>
 #include <nuttx/net/arp.h>
 
diff --git a/nuttx/net/pkt/pkt_poll.c b/nuttx/net/pkt/pkt_poll.c
index ab34a3b9a..58ca8f3b7 100644
--- a/nuttx/net/pkt/pkt_poll.c
+++ b/nuttx/net/pkt/pkt_poll.c
@@ -49,7 +49,7 @@
 
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/uip/uip.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 #include <nuttx/net/uip/uip-pkt.h>
 
 #include "uip/uip_internal.h"
diff --git a/nuttx/net/pkt/pkt_send.c b/nuttx/net/pkt/pkt_send.c
index 0481e489e..e8449eb6b 100644
--- a/nuttx/net/pkt/pkt_send.c
+++ b/nuttx/net/pkt/pkt_send.c
@@ -52,7 +52,7 @@
 #include <arch/irq.h>
 #include <nuttx/clock.h>
 #include <nuttx/net/arp.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 #include <nuttx/net/uip/uip-pkt.h>
 
 #include "net_internal.h"
diff --git a/nuttx/net/recvfrom.c b/nuttx/net/recvfrom.c
index efe8fe272..d7f479309 100644
--- a/nuttx/net/recvfrom.c
+++ b/nuttx/net/recvfrom.c
@@ -54,7 +54,7 @@
 
 #include <arch/irq.h>
 #include <nuttx/clock.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "net_internal.h"
 #include "uip/uip_internal.h"
diff --git a/nuttx/net/sendto.c b/nuttx/net/sendto.c
index 992d9066e..e34afc9dc 100644
--- a/nuttx/net/sendto.c
+++ b/nuttx/net/sendto.c
@@ -49,7 +49,7 @@
 #include <arch/irq.h>
 
 #include <nuttx/clock.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "net_internal.h"
 #include "uip/uip_internal.h"
diff --git a/nuttx/net/tcp/tcp_appsend.c b/nuttx/net/tcp/tcp_appsend.c
index 79b27efe0..9f95906f5 100644
--- a/nuttx/net/tcp/tcp_appsend.c
+++ b/nuttx/net/tcp/tcp_appsend.c
@@ -50,7 +50,7 @@
 
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/uip/uip.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "uip/uip_internal.h"
 
diff --git a/nuttx/net/tcp/tcp_callback.c b/nuttx/net/tcp/tcp_callback.c
index 8a15e86e2..63b2d5199 100644
--- a/nuttx/net/tcp/tcp_callback.c
+++ b/nuttx/net/tcp/tcp_callback.c
@@ -47,7 +47,7 @@
 
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/uip/uip.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "uip/uip_internal.h"
 
diff --git a/nuttx/net/tcp/tcp_conn.c b/nuttx/net/tcp/tcp_conn.c
index 87b8881c2..b95cd7e7b 100644
--- a/nuttx/net/tcp/tcp_conn.c
+++ b/nuttx/net/tcp/tcp_conn.c
@@ -53,7 +53,7 @@
 
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/uip/uip.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "tcp/tcp.h"
 #include "uip/uip_internal.h"
diff --git a/nuttx/net/tcp/tcp_input.c b/nuttx/net/tcp/tcp_input.c
index 76d688eda..e373e466e 100644
--- a/nuttx/net/tcp/tcp_input.c
+++ b/nuttx/net/tcp/tcp_input.c
@@ -52,7 +52,7 @@
 
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/uip/uip.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "uip/uip_internal.h"
 
diff --git a/nuttx/net/tcp/tcp_poll.c b/nuttx/net/tcp/tcp_poll.c
index 39955b7f1..b0286fd24 100644
--- a/nuttx/net/tcp/tcp_poll.c
+++ b/nuttx/net/tcp/tcp_poll.c
@@ -50,7 +50,7 @@
 
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/uip/uip.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "uip/uip_internal.h"
 
diff --git a/nuttx/net/tcp/tcp_send.c b/nuttx/net/tcp/tcp_send.c
index 4d98e269c..0b079934f 100644
--- a/nuttx/net/tcp/tcp_send.c
+++ b/nuttx/net/tcp/tcp_send.c
@@ -50,7 +50,7 @@
 
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/uip/uip.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "uip/uip_internal.h"
 
diff --git a/nuttx/net/tcp/tcp_send_buffered.c b/nuttx/net/tcp/tcp_send_buffered.c
index 8dbf797d5..1f0a568f2 100644
--- a/nuttx/net/tcp/tcp_send_buffered.c
+++ b/nuttx/net/tcp/tcp_send_buffered.c
@@ -65,7 +65,7 @@
 #include <nuttx/clock.h>
 #include <nuttx/net/arp.h>
 #include <nuttx/net/iob.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "net_internal.h"
 #include "tcp/tcp.h"
diff --git a/nuttx/net/tcp/tcp_send_unbuffered.c b/nuttx/net/tcp/tcp_send_unbuffered.c
index 34a71018f..ad58daf8a 100644
--- a/nuttx/net/tcp/tcp_send_unbuffered.c
+++ b/nuttx/net/tcp/tcp_send_unbuffered.c
@@ -53,7 +53,7 @@
 #include <arch/irq.h>
 #include <nuttx/clock.h>
 #include <nuttx/net/arp.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "net_internal.h"
 #include "uip/uip_internal.h"
diff --git a/nuttx/net/tcp/tcp_seqno.c b/nuttx/net/tcp/tcp_seqno.c
index 5242fe9a0..754740717 100644
--- a/nuttx/net/tcp/tcp_seqno.c
+++ b/nuttx/net/tcp/tcp_seqno.c
@@ -52,7 +52,7 @@
 
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/uip/uip.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "uip/uip_internal.h"
 
diff --git a/nuttx/net/tcp/tcp_timer.c b/nuttx/net/tcp/tcp_timer.c
index 06be1902f..0b159abc4 100644
--- a/nuttx/net/tcp/tcp_timer.c
+++ b/nuttx/net/tcp/tcp_timer.c
@@ -50,7 +50,7 @@
 
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/uip/uip.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "uip/uip_internal.h"
 
diff --git a/nuttx/net/udp/udp_callback.c b/nuttx/net/udp/udp_callback.c
index cec22630c..b43a5f4fc 100644
--- a/nuttx/net/udp/udp_callback.c
+++ b/nuttx/net/udp/udp_callback.c
@@ -45,7 +45,7 @@
 
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/uip/uip.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "uip/uip_internal.h"
 
diff --git a/nuttx/net/udp/udp_conn.c b/nuttx/net/udp/udp_conn.c
index f1c0195c2..4b8178283 100644
--- a/nuttx/net/udp/udp_conn.c
+++ b/nuttx/net/udp/udp_conn.c
@@ -58,7 +58,7 @@
 
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/uip/uip.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "uip/uip_internal.h"
 
diff --git a/nuttx/net/udp/udp_input.c b/nuttx/net/udp/udp_input.c
index f9e710795..d5280f432 100644
--- a/nuttx/net/udp/udp_input.c
+++ b/nuttx/net/udp/udp_input.c
@@ -49,7 +49,7 @@
 
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/uip/uip.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "uip/uip_internal.h"
 
diff --git a/nuttx/net/udp/udp_poll.c b/nuttx/net/udp/udp_poll.c
index b565e50e8..46ea6ddce 100644
--- a/nuttx/net/udp/udp_poll.c
+++ b/nuttx/net/udp/udp_poll.c
@@ -49,7 +49,7 @@
 
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/uip/uip.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "uip/uip_internal.h"
 
diff --git a/nuttx/net/udp/udp_send.c b/nuttx/net/udp/udp_send.c
index 4296d69e9..5f43eafd4 100644
--- a/nuttx/net/udp/udp_send.c
+++ b/nuttx/net/udp/udp_send.c
@@ -48,7 +48,7 @@
 
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/uip/uip.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "uip/uip_internal.h"
 
diff --git a/nuttx/net/uip/uip_callback.c b/nuttx/net/uip/uip_callback.c
index 3c8bb19f8..6caf28c10 100644
--- a/nuttx/net/uip/uip_callback.c
+++ b/nuttx/net/uip/uip_callback.c
@@ -46,7 +46,7 @@
 
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/uip/uip.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "uip_internal.h"
 
diff --git a/nuttx/net/uip/uip_chksum.c b/nuttx/net/uip/uip_chksum.c
index 8670f2e1e..1f28eeaf0 100644
--- a/nuttx/net/uip/uip_chksum.c
+++ b/nuttx/net/uip/uip_chksum.c
@@ -45,7 +45,7 @@
 
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/uip/uip.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "uip_internal.h"
 
diff --git a/nuttx/net/uip/uip_input.c b/nuttx/net/uip/uip_input.c
index 0bff32387..b9b94f193 100644
--- a/nuttx/net/uip/uip_input.c
+++ b/nuttx/net/uip/uip_input.c
@@ -87,7 +87,7 @@
 
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/uip/uip.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #ifdef CONFIG_NET_IPv6
 # include "uip_neighbor.h"
diff --git a/nuttx/net/uip/uip_iobsend.c b/nuttx/net/uip/uip_iobsend.c
index dde2dfeb2..2fda3bd47 100644
--- a/nuttx/net/uip/uip_iobsend.c
+++ b/nuttx/net/uip/uip_iobsend.c
@@ -45,7 +45,7 @@
 
 #include <nuttx/net/iob.h>
 #include <nuttx/net/uip/uip.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #ifdef CONFIG_NET_IOB
 
diff --git a/nuttx/net/uip/uip_pktsend.c b/nuttx/net/uip/uip_pktsend.c
index 13f7272ee..1a53c93cd 100644
--- a/nuttx/net/uip/uip_pktsend.c
+++ b/nuttx/net/uip/uip_pktsend.c
@@ -44,7 +44,7 @@
 #include <debug.h>
 
 #include <nuttx/net/uip/uip.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #ifdef CONFIG_NET_PKT
 
diff --git a/nuttx/net/uip/uip_poll.c b/nuttx/net/uip/uip_poll.c
index 25185e4f9..adab74520 100644
--- a/nuttx/net/uip/uip_poll.c
+++ b/nuttx/net/uip/uip_poll.c
@@ -44,7 +44,7 @@
 
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/uip/uip.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 #include "uip_internal.h"
 
diff --git a/nuttx/net/uip/uip_send.c b/nuttx/net/uip/uip_send.c
index 5a9015d89..1eaf97414 100644
--- a/nuttx/net/uip/uip_send.c
+++ b/nuttx/net/uip/uip_send.c
@@ -46,7 +46,7 @@
 #include <debug.h>
 
 #include <nuttx/net/uip/uip.h>
-#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/netdev.h>
 
 /****************************************************************************
  * Pre-processor Definitions