Move all non-standard, NuttX header files into include/nuttx/net

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4450 7fd9a85b-ad96-42d3-883c-3090e2eb8679

apps/examples/ftpc/ftpc_main.c

@@ -295,7 +295,7 @@ static int ftpc_execute(SESSION handle, int argc, char *argv[])
 
 int ftpc_parse(SESSION handle, char *cmdline)
 {
-  FAR char *argv[FTPC_MAX_ARGUMENTS];
+  FAR char *argv[FTPC_MAX_ARGUMENTS+1];
   FAR char *saveptr;
   FAR char *cmd;
   int       argc;

apps/examples/igmp/igmp.c

@@ -45,7 +45,7 @@
 #include <debug.h>
 
 #include <net/if.h>
-#include <net/uip/uip.h>
+#include <nuttx/net/uip/uip.h>
 #include <apps/netutils/uiplib.h>
 #include <apps/netutils/ipmsfilter.h>
 

apps/examples/nettest/nettest.c

@@ -44,7 +44,7 @@
 #include <debug.h>
 
 #include <net/if.h>
-#include <net/uip/uip.h>
+#include <nuttx/net/uip/uip.h>
 #include <apps/netutils/uiplib.h>
 
 #include "nettest.h"

apps/examples/thttpd/content/netstat/netstat.c

@@ -44,8 +44,8 @@
 #include <unistd.h>
 
 #include <netinet/ether.h>
-#include <net/uip/uipopt.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uipopt.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 /****************************************************************************
  * Pre-processor Definitions

apps/examples/thttpd/main.c

@@ -1,8 +1,8 @@
 /****************************************************************************
  * examples/thttpd/main.c
  *
- *   Copyright (C) 2009-2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2009-2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
   * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -51,7 +51,7 @@
 #include <net/if.h>
 #include <netinet/ether.h>
 
-#include <net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip-arp.h>
 #include <apps/netutils/uiplib.h>
 #include <apps/netutils/thttpd.h>
 
@@ -59,7 +59,7 @@
 #include <nuttx/binfmt.h>
 #include <nuttx/nxflat.h>
 #ifdef CONFIG_NET_SLIP
-#  include <nuttx/net.h>
+#  include <nuttx/net/net.h>
 #endif
 
 #include "content/romfs.h"

apps/examples/udp/target.c

@@ -41,7 +41,7 @@
 #include <stdio.h>
 #include <debug.h>
 
-#include <net/uip/uip.h>
+#include <nuttx/net/uip/uip.h>
 #include <apps/netutils/uiplib.h>
 
 #include "udp-internal.h"

apps/examples/uip/main.c

@@ -54,8 +54,8 @@
 #include <debug.h>
 
 #include <net/if.h>
-#include <net/uip/uip.h>
-#include <net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arp.h>
 
 #include <apps/netutils/uiplib.h>
 

apps/examples/wget/target.c

@@ -46,7 +46,7 @@
 #include <arpa/inet.h>
 #include <net/if.h>
 
-#include <net/uip/uip.h>
+#include <nuttx/net/uip/uip.h>
 
 #include <apps/netutils/uiplib.h>
 #include <apps/netutils/resolv.h>

apps/examples/wlan/wlan_main.c

@@ -57,8 +57,8 @@
 #include <nuttx/usb/usbhost.h>
 
 #include <net/if.h>
-#include <net/uip/uip.h>
-#include <net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arp.h>
 
 #include <apps/netutils/uiplib.h>
 

apps/include/netutils/resolv.h

@@ -33,7 +33,7 @@
 #ifndef __APPS_NETUTILS_RESOLVE_H
 #define __APPS_NETUTILS_RESOLVE_H
 
-#include <net/uip/uipopt.h>
+#include <nuttx/net/uip/uipopt.h>
 
 #undef EXTERN
 #if defined(__cplusplus)

apps/include/netutils/smtp.h

@@ -44,8 +44,8 @@
  * Included Files
  ****************************************************************************/
 
-#include <net/uip/uipopt.h>
-#include <net/uip/uip.h>
+#include <nuttx/net/uip/uipopt.h>
+#include <nuttx/net/uip/uip.h>
 
 /****************************************************************************
  * Type Definitions

apps/include/netutils/uiplib.h

@@ -56,7 +56,7 @@
 #include <pthread.h>
 
 #include <netinet/in.h>
-#include <net/uip/uipopt.h>
+#include <nuttx/net/uip/uipopt.h>
 
 /****************************************************************************
  * Pre-processor Definitions

apps/netutils/dhcpc/dhcpc.c

@@ -52,7 +52,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <net/uip/uip.h>
+#include <nuttx/net/uip/uip.h>
 #include <apps/netutils/dhcpc.h>
 #include <apps/netutils/uiplib.h>
 

apps/netutils/dhcpd/dhcpd.c

@@ -56,7 +56,7 @@
 # include <debug.h>               /* For ndbg, vdbg */
 # include <nuttx/compiler.h>      /* For CONFIG_CPP_HAVE_WARNING */
 # include <arch/irq.h>            /* For irqstore() and friends -- REVISIT */
-# include <net/uip/uip-arp.h>     /* For low-level ARP interfaces -- REVISIT */
+# include <nuttx/net/uip/uip-arp.h>     /* For low-level ARP interfaces -- REVISIT */
 # include <apps/netutils/dhcpd.h> /* Advertised DHCPD APIs */
 #endif
 

apps/netutils/ftpc/ftpc_login.c

@@ -1,8 +1,8 @@
 /****************************************************************************
  * apps/netutils/ftpc/ftpc_login.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -145,7 +145,6 @@ errout:
 
 int ftpc_relogin(FAR struct ftpc_session_s *session)
 {
-  int err;
   int ret;
 
   /* Log into the server.  First send the USER command.  The server may accept

apps/netutils/smtp/smtp.c

@@ -57,7 +57,7 @@
 #include <semaphore.h>
 #include <sys/socket.h>
 
-#include <net/uip/uip.h>
+#include <nuttx/net/uip/uip.h>
 #include <apps/netutils/smtp.h>
 
 /****************************************************************************

apps/netutils/telnetd/telnetd_driver.c

@@ -1,9 +1,6 @@
 /****************************************************************************
  * apps/netutils/telnetd_driver.c
  *
- *   Copyright (C) 2008-2 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
- *
  *   Copyright (C) 2007, 2009, 2011-2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
@@ -62,7 +59,7 @@
 #include <nuttx/fs.h>
 #include <debug.h>
 
-#include <nuttx/net.h>
+#include <nuttx/net/net.h>
 
 #include <apps/netutils/telnetd.h>
 #include <apps/netutils/uiplib.h>

apps/netutils/tftpc/tftpc_get.c

@@ -49,8 +49,8 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <net/uip/uipopt.h>
-#include <net/uip/uip.h>
+#include <nuttx/net/uip/uipopt.h>
+#include <nuttx/net/uip/uip.h>
 #include <apps/netutils/tftp.h>
 
 #include "tftpc_internal.h"

apps/netutils/tftpc/tftpc_internal.h

@@ -47,7 +47,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include <net/uip/uipopt.h>
+#include <nuttx/net/uip/uipopt.h>
 
 /****************************************************************************
  * Pre-processor Definitions

apps/netutils/tftpc/tftpc_packets.c

@@ -51,8 +51,8 @@
 
 #include <netinet/in.h>
 
-#include <net/uip/uipopt.h>
-#include <net/uip/uip.h>
+#include <nuttx/net/uip/uipopt.h>
+#include <nuttx/net/uip/uip.h>
 #include <apps/netutils/tftp.h>
 
 #include "tftpc_internal.h"

apps/netutils/tftpc/tftpc_put.c

@@ -49,8 +49,8 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <net/uip/uipopt.h>
-#include <net/uip/uip.h>
+#include <nuttx/net/uip/uipopt.h>
+#include <nuttx/net/uip/uip.h>
 #include <apps/netutils/tftp.h>
 
 #include "tftpc_internal.h"

apps/netutils/uiplib/uiplib.c

@@ -46,7 +46,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include <net/uip/uip.h>
+#include <nuttx/net/uip/uip.h>
 #include <apps/netutils/uiplib.h>
 
 /****************************************************************************

apps/netutils/webserver/httpd.c

@@ -58,7 +58,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <net/uip/uip.h>
+#include <nuttx/net/uip/uip.h>
 #include <apps/netutils/uiplib.h>
 #include <apps/netutils/httpd.h>
 

apps/netutils/webserver/httpd.h

@@ -46,8 +46,8 @@
 
 #include <nuttx/config.h>
 #include <stdint.h>
-#include <net/uip/uip.h>
-#include <net/uip/uipopt.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uipopt.h>
 
 /****************************************************************************
  * Pre-processor Definitions

apps/netutils/webserver/httpd_cgi.c

@@ -42,7 +42,7 @@
 
 #include <nuttx/compiler.h>
 
-#include <net/uip/uip.h>
+#include <nuttx/net/uip/uip.h>
 #include <apps/netutils/httpd.h>
 
 #include "httpd_cgi.h"

apps/netutils/webserver/httpd_fsdata.h

@@ -44,7 +44,7 @@
  ****************************************************************************/
 
 #include <stdint.h>
-#include <net/uip/uip.h>
+#include <nuttx/net/uip/uip.h>
 
 /****************************************************************************
  * Public Types

apps/nshlib/nsh_netcmds.c

@@ -52,15 +52,15 @@
 #include <libgen.h>      /* Needed for basename */
 #include <errno.h>
 
-#include <nuttx/net.h>
+#include <nuttx/net/net.h>
 #include <nuttx/clock.h>
 #include <net/ethernet.h>
-#include <net/uip/uip.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arch.h>
 #include <netinet/ether.h>
 
 #ifdef CONFIG_NET_STATISTICS
-#  include <net/uip/uip.h>
+#  include <nuttx/net/uip/uip.h>
 #endif
 
 #if defined(CONFIG_NET_ICMP) && defined(CONFIG_NET_ICMP_PING) && \

misc/drivers/rtl8187x/rtl8187x.c

@@ -72,9 +72,9 @@
 #include <nuttx/usb/usb.h>
 #include <nuttx/usb/usbhost.h>
 
-#include <net/uip/uip.h>
-#include <net/uip/uip-arp.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "rtl8187x.h"
 

nuttx/ChangeLog

@@ -2526,4 +2526,6 @@
 	  low level, thread-independent socket interfaces for use within the OS.
 	  Some of these are currently used by the FTP controlling terminal.  More will
 	  be used to support the NFS file system currenly underwork.
-
+	* include/nuttx/net/:  Major re-organization of networking headerf files.
+	  Moved all non-standard, NuttX-specific header files from include/net and
+	  include/nuttx into include/nuttx/net.

nuttx/Documentation/NuttxPortingGuide.html

@@ -12,7 +12,7 @@
       <h1><big><font color="#3c34ec">
         <i>NuttX RTOS Porting Guide</i>
       </font></big></h1>
-      <p>Last Updated: February 28, 2011</p>
+      <p>Last Updated: March 3, 2011</p>
     </td>
   </tr>
 </table>
@@ -1113,12 +1113,12 @@ include/
 |   `-- <i>(Standard header files)</i>
 |-- cxx/
 |   `-- <i>(C++ standard header files)</i>
-|-- net/
-|   `-- uip/
-|       `-- <i>(uIP specific header files)</i>
 |-- netinet/
 |   `-- <i>(Standard header files)</i>
 |-- nuttx/
+|   |-net/
+|   | `-- uip/
+|   |     `-- <i>(uIP specific header files)</i>
 |   `-- <i>(NuttX specific header files)</i>
 `- sys/
     `-- <i>(More standard header files)</i>
@@ -1185,7 +1185,7 @@ lib/
 
 <h2>2.12 <a name="DirStructNet">nuttx/net</a></h2>
 <p>
-  This directory contains the implementation of the socket APIs.
+  This directory contains the implementation of the NuttX internal socket APIs.
   The subdirectory, <code>uip</code> contains the uIP port.
 </P>
 
@@ -2424,7 +2424,7 @@ extern void up_ledoff(int led);
 <ul>
   <li>
     <p>
-    <b><code>include/net/uip/uip-arch.h</code></b>.
+    <b><code>include/nuttx/net/uip/uip-arch.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>.

nuttx/arch/arm/src/c5471/c5471_ethernet.c

@@ -58,9 +58,9 @@
 #include <nuttx/arch.h>
 
 #include <net/ethernet.h>
-#include <net/uip/uip.h>
-#include <net/uip/uip-arp.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "chip.h"
 #include "up_arch.h"

nuttx/arch/arm/src/kinetis/kinetis_enet.c

@@ -1,8 +1,8 @@
 /****************************************************************************
  * drivers/net/kinetis_enet.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -51,11 +51,11 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/mii.h>
+#include <nuttx/net/mii.h>
 
-#include <net/uip/uip.h>
-#include <net/uip/uip-arp.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "up_arch.h"
 #include "chip.h"

nuttx/arch/arm/src/lm3s/lm3s_ethernet.c

@@ -51,9 +51,9 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
-#include <net/uip/uip.h>
-#include <net/uip/uip-arp.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "chip.h"
 #include "up_arch.h"

nuttx/arch/arm/src/lm3s/lm3s_ethernet.h

@@ -1,8 +1,8 @@
 /************************************************************************************
  * arch/arm/src/lm3s/lm3s_ethernet.h
  *
- *   Copyright (C) 2009-2010 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2009-2010, 2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -41,7 +41,7 @@
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include <nuttx/mii.h>
+#include <nuttx/net/mii.h>
 
 #include "chip.h"
 
@@ -72,7 +72,7 @@
 #  define LM3S_MAC_TS_OFFSET  0x03c /* Ethernet MAC Time Stamp Configuration */
 #endif
 
-/* MII Management Register Offsets (see include/nuttx/mii.h) */
+/* MII Management Register Offsets (see include/nuttx/net/mii.h) */
 
 /* Ethernet Controller Register Addresses *******************************************/
 

nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c

@@ -1,8 +1,8 @@
 /****************************************************************************
  * arch/arm/src/lpc17xx/lpc17_ethernet.c
  *
- *   Copyright (C) 2010-2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2010-2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -50,12 +50,12 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/mii.h>
+#include <nuttx/net/mii.h>
 
-#include <net/uip/uip.h>
-#include <net/uip/uipopt.h>
-#include <net/uip/uip-arp.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uipopt.h>
+#include <nuttx/net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "chip.h"
 #include "up_arch.h"

nuttx/arch/arm/src/stm32/stm32_eth.c

@@ -51,11 +51,11 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/mii.h>
+#include <nuttx/net/mii.h>
 
-#include <net/uip/uip.h>
-#include <net/uip/uip-arp.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "up_internal.h"
 

nuttx/arch/hc/src/m9s12/m9s12_ethernet.c

@@ -51,9 +51,9 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 
-#include <net/uip/uip.h>
-#include <net/uip/uip-arp.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 /****************************************************************************
  * Definitions

nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c

@@ -52,12 +52,12 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/mii.h>
+#include <nuttx/net/mii.h>
 
-#include <net/uip/uip.h>
-#include <net/uip/uipopt.h>
-#include <net/uip/uip-arp.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uipopt.h>
+#include <nuttx/net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include <arch/irq.h>
 #include <arch/board/board.h>

nuttx/arch/sim/src/up_uipdriver.c

@@ -1,8 +1,8 @@
 /****************************************************************************
  * up_uipdriver.c
  *
- *   Copyright (C) 2007, 2009-2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2007, 2009-2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Based on code from uIP which also has a BSD-like license:
  *
@@ -50,12 +50,12 @@
 #include <stdbool.h>
 #include <string.h>
 #include <sched.h>
-#include <nuttx/net.h>
+#include <nuttx/net/net.h>
 
 #include <net/ethernet.h>
-#include <net/uip/uip.h>
-#include <net/uip/uip-arch.h>
-#include <net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip-arp.h>
 
 #include "up_internal.h"
 

nuttx/arch/z80/src/ez80/ez80_emac.c

@@ -1,8 +1,8 @@
 /****************************************************************************
  * drivers/net/ez80_emac.c
  *
- *   Copyright (C) 2009-2010 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2009-2010, 2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * References:
  *   eZ80F91 MCU Product Specification, PS019214-0808, Zilig, Inc., 2008.
@@ -54,13 +54,13 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/mii.h>
+#include <nuttx/net/mii.h>
 
 #include <arch/io.h>
 
-#include <net/uip/uip.h>
-#include <net/uip/uip-arp.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "chip.h"
 #include "up_internal.h"

nuttx/configs/olimex-strp711/src/up_enc28j60.c

@@ -1,8 +1,8 @@
 /****************************************************************************
  * configs/olimex-strp711/src/up_enc28j60.c
  *
- *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2010, 2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -86,7 +86,7 @@
 #include <debug.h>
 
 #include <nuttx/spi.h>
-#include <nuttx/enc28j60.h>
+#include <nuttx/net/enc28j60.h>
 
 #include <arch/board/board.h>
 

nuttx/drivers/README.txt

@@ -88,7 +88,7 @@ mtd/
 	aware of any other common way to refer to this class of devices).
 
 net/
-	Network interface drivers.  See also include/nuttx/net.h
+	Network interface drivers.  See also include/nuttx/net/net.h
 
 pipes/
 	FIFO and named pipe drivers.  Standard interfaces are declared

nuttx/drivers/net/cs89x0.c

@@ -51,9 +51,9 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 
-#include <net/uip/uip.h>
-#include <net/uip/uip-arp.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 /****************************************************************************
  * Definitions

nuttx/drivers/net/dm90x0.c

@@ -64,9 +64,9 @@
 #include <nuttx/arch.h>
 
 #include <net/ethernet.h>
-#include <net/uip/uip.h>
-#include <net/uip/uip-arp.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 /****************************************************************************
  * Definitions

nuttx/drivers/net/e1000.c

@@ -53,9 +53,9 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 
-#include <net/uip/uip.h>
-#include <net/uip/uip-arp.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include <rgmp/pmap.h>
 #include <rgmp/string.h>

nuttx/drivers/net/enc28j60.c

@@ -1,8 +1,8 @@
 /****************************************************************************
  * drivers/net/enc28j60.c
  *
- *   Copyright (C) 2010-2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2010-2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * References:
  * - ENC28J60 Data Sheet, Stand-Alone Ethernet Controller with SPI Interface,
@@ -58,11 +58,11 @@
 #include <nuttx/spi.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/clock.h>
-#include <nuttx/enc28j60.h>
+#include <nuttx/net/enc28j60.h>
 
-#include <net/uip/uip.h>
-#include <net/uip/uip-arp.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include "enc28j60.h"
 

nuttx/drivers/net/skeleton.c

@@ -51,9 +51,9 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 
-#include <net/uip/uip.h>
-#include <net/uip/uip-arp.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 /****************************************************************************
  * Definitions

nuttx/drivers/net/slip.c

@@ -1,8 +1,8 @@
 /****************************************************************************
  * drivers/net/slip.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Reference: RFC 1055
  *
@@ -55,10 +55,10 @@
 #include <debug.h>
 
 #include <nuttx/irq.h>
-#include <nuttx/net.h>
+#include <nuttx/net/net.h>
 
-#include <net/uip/uip.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #if defined(CONFIG_NET) && defined(CONFIG_NET_SLIP)
 

nuttx/drivers/net/vnet.c

@@ -55,9 +55,9 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 
-#include <net/uip/uip.h>
-#include <net/uip/uip-arp.h>
-#include <net/uip/uip-arch.h>
+#include <nuttx/net/uip/uip.h>
+#include <nuttx/net/uip/uip-arp.h>
+#include <nuttx/net/uip/uip-arch.h>
 
 #include <rgmp/vnet.h>
 #include <rgmp/stdio.h>

nuttx/fs/fs_close.c

@@ -1,8 +1,8 @@
 /****************************************************************************
  * fs/fs_close.c
  *
- *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2007-2009, 2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -45,7 +45,7 @@
 #include <nuttx/fs.h>
 
 #if defined(CONFIG_NET) && CONFIG_NSOCKET_DESCRIPTORS > 0
-# include <nuttx/net.h>
+# include <nuttx/net/net.h>
 #endif
 
 #include "fs_internal.h"