Added support for socket descriptors

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@318 42af7a65-404d-4744-a932-0658087f49c3

7 files changed, 267 insertions, 254 deletions

diff --git a/nuttx/configs/README.txt b/nuttx/configs/README.txt
index 3d7cc69db..ffba46227 100644
--- a/nuttx/configs/README.txt
+++ b/nuttx/configs/README.txt
@@ -208,32 +208,33 @@ defconfig -- This is a configuration file similar to the Linux
 		  structures.  The system manages a pool of preallocated
 		  watchdog structures to minimize dynamic allocations
 
-	TCP/IP support via uIP
-		CONFIG_NET_UIP - Enable or disable all uIP features
-		CONFIG_NET_UIP_IPv6 - Build in support for IPv6
-		CONFIG_UIP_MAX_CONNECTIONS - Maximum number of TCP connections
-		CONFIG_UIP_MAX_LISTENPORTS - Maximum number of listening TCP ports
-		CONFIG_UIP_BUFFER_SIZE - uIP buffer size
-		CONFIG_UIP_LOGGING - Logging on or off
-		CONFIG_UIP_UDP - UDP support on or off
-		CONFIG_UIP_UDP_CHECKSUMS - UDP checksums on or off
-		CONFIG_UIP_UDP_CONNS - The maximum amount of concurrent UDP
+	TCP/IP and UDP support via uIP
+		CONFIG_NET - Enable or disable all network features
+		CONFIG_NET_IPv6 - Build in support for IPv6
+		CONFIG_NSOCKET_DESCRIPTORS - Maximum number of socket descriptors per task/thread.
+		CONFIG_NET_MAX_CONNECTIONS - Maximum number of TCP connections
+		CONFIG_NET_MAX_LISTENPORTS - Maximum number of listening TCP ports
+		CONFIG_NET_BUFFER_SIZE - uIP buffer size
+		CONFIG_NET_LOGGING - Logging on or off
+		CONFIG_NET_UDP - UDP support on or off
+		CONFIG_NET_UDP_CHECKSUMS - UDP checksums on or off
+		CONFIG_NET_UDP_CONNS - The maximum amount of concurrent UDP
 		  connections
-		CONFIG_UIP_STATISTICS - uIP statistics on or off
-		CONFIG_UIP_PINGADDRCONF - Use "ping" packet for setting IP address
-		CONFIG_UIP_RECEIVE_WINDOW - The size of the advertised receiver's
+		CONFIG_NET_STATISTICS - uIP statistics on or off
+		CONFIG_NET_PINGADDRCONF - Use "ping" packet for setting IP address
+		CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's
 		  window
-		CONFIG_UIP_ARPTAB_SIZE - The size of the ARP table
-		CONFIG_UIP_BROADCAST - Broadcast support
-		CONFIG_UIP_LLH_LEN - The link level header length
-		CONFIG_UIP_EXTERNAL_BUFFER - Incoming packet buffer (uip_buf)
+		CONFIG_NET_ARPTAB_SIZE - The size of the ARP table
+		CONFIG_NET_BROADCAST - Broadcast support
+		CONFIG_NET_LLH_LEN - The link level header length
+		CONFIG_NET_EXTERNAL_BUFFER - Incoming packet buffer (uip_buf)
 		  is defined externally
-		CONFIG_UIP_FWCACHE_SIZE - number of packets to remember when
+		CONFIG_NET_FWCACHE_SIZE - number of packets to remember when
 		  looking for duplicates
 
 	UIP Network Utilities
-		CONFIG_UIP_DHCP_LIGHT - Reduces size of DHCP
-		CONFIG_UIP_RESOLV_ENTRIES - Number of resolver entries
+		CONFIG_NET_DHCP_LIGHT - Reduces size of DHCP
+		CONFIG_NET_RESOLV_ENTRIES - Number of resolver entries
 
 	Stack and heap information
 
diff --git a/nuttx/configs/c5471evm/defconfig b/nuttx/configs/c5471evm/defconfig
index 4c7acd09a..cad404821 100644
--- a/nuttx/configs/c5471evm/defconfig
+++ b/nuttx/configs/c5471evm/defconfig
@@ -250,48 +250,50 @@ CONFIG_PREALLOC_WDOGS=32
 CONFIG_PREALLOC_TIMERS=8
 
 #
-# TCP/IP support via uIP
-# CONFIG_NET_UIP - Enable or disable all uIP features
-# CONFIG_NET_UIP_IPv6 - Build in support for IPv6
-# CONFIG_UIP_MAX_CONNECTIONS - Maximum number of TCP connections
-# CONFIG_UIP_MAX_LISTENPORTS - Maximum number of listening TCP ports
-# CONFIG_UIP_BUFFER_SIZE - uIP buffer size
-# CONFIG_UIP_LOGGING - Logging on or off
-# CONFIG_UIP_UDP - UDP support on or off
-# CONFIG_UIP_UDP_CHECKSUMS - UDP checksums on or off
-# CONFIG_UIP_UDP_CONNS - The maximum amount of concurrent UDP connections
-# CONFIG_UIP_STATISTICS - uIP statistics on or off
-# CONFIG_UIP_PINGADDRCONF - Use "ping" packet for setting IP address
-# CONFIG_UIP_RECEIVE_WINDOW - The size of the advertised receiver's window
-# CONFIG_UIP_ARPTAB_SIZE - The size of the ARP table
-# CONFIG_UIP_BROADCAST - Broadcast support
-# CONFIG_UIP_LLH_LEN - The link level header length
-# CONFIG_UIP_EXTERNAL_BUFFER - Incoming packet buffer (uip_buf) is defined externally
-# CONFIG_UIP_FWCACHE_SIZE - number of packets to remember when looking for duplicates
-CONFIG_NET_UIP=n
-CONFIG_NET_UIP_IPv6=n
-CONFIG_UIP_MAX_CONNECTIONS=40
-CONFIG_UIP_MAX_LISTENPORTS=40
-CONFIG_UIP_BUFFER_SIZE=420
-CONFIG_UIP_LOGGING=y
-CONFIG_UIP_UDP=n
-CONFIG_UIP_UDP_CHECKSUMS=y
-#CONFIG_UIP_UDP_CONNS=10
-CONFIG_UIP_STATISTICS=y
-#CONFIG_UIP_PINGADDRCONF=0
-#CONFIG_UIP_RECEIVE_WINDOW=
-#CONFIG_UIP_ARPTAB_SIZE=8
-CONFIG_UIP_BROADCAST=n
-#CONFIG_UIP_LLH_LEN=14
-CONFIG_UIP_EXTERNAL_BUFFER=n
-#CONFIG_UIP_FWCACHE_SIZE=2
+# TCP/IP and UDP support via uIP
+# CONFIG_NET - Enable or disable all network features
+# CONFIG_NET_IPv6 - Build in support for IPv6
+# CONFIG_NSOCKET_DESCRIPTORS - Maximum number of socket descriptors per task/thread.
+# CONFIG_NET_MAX_CONNECTIONS - Maximum number of TCP connections
+# CONFIG_NET_MAX_LISTENPORTS - Maximum number of listening TCP ports
+# CONFIG_NET_BUFFER_SIZE - uIP buffer size
+# CONFIG_NET_LOGGING - Logging on or off
+# CONFIG_NET_UDP - UDP support on or off
+# CONFIG_NET_UDP_CHECKSUMS - UDP checksums on or off
+# CONFIG_NET_UDP_CONNS - The maximum amount of concurrent UDP connections
+# CONFIG_NET_STATISTICS - uIP statistics on or off
+# CONFIG_NET_PINGADDRCONF - Use "ping" packet for setting IP address
+# CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window
+# CONFIG_NET_ARPTAB_SIZE - The size of the ARP table
+# CONFIG_NET_BROADCAST - Broadcast support
+# CONFIG_NET_LLH_LEN - The link level header length
+# CONFIG_NET_EXTERNAL_BUFFER - Incoming packet buffer (uip_buf) is defined externally
+# CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates
+CONFIG_NET=n
+CONFIG_NET_IPv6=n
+CONFIG_NSOCKET_DESCRIPTORS=0
+CONFIG_NET_MAX_CONNECTIONS=40
+CONFIG_NET_MAX_LISTENPORTS=40
+CONFIG_NET_BUFFER_SIZE=420
+CONFIG_NET_LOGGING=y
+CONFIG_NET_UDP=n
+CONFIG_NET_UDP_CHECKSUMS=y
+#CONFIG_NET_UDP_CONNS=10
+CONFIG_NET_STATISTICS=y
+#CONFIG_NET_PINGADDRCONF=0
+#CONFIG_NET_RECEIVE_WINDOW=
+#CONFIG_NET_ARPTAB_SIZE=8
+CONFIG_NET_BROADCAST=n
+#CONFIG_NET_LLH_LEN=14
+CONFIG_NET_EXTERNAL_BUFFER=n
+#CONFIG_NET_FWCACHE_SIZE=2
 
 #
 # UIP Network Utilities
-# CONFIG_UIP_DHCP_LIGHT - Reduces size of DHCP
-# CONFIG_UIP_RESOLV_ENTRIES - Number of resolver entries
-CONFIG_UIP_DHCP_LIGHT=n
-CONFIG_UIP_RESOLV_ENTRIES=4
+# CONFIG_NET_DHCP_LIGHT - Reduces size of DHCP
+# CONFIG_NET_RESOLV_ENTRIES - Number of resolver entries
+CONFIG_NET_DHCP_LIGHT=n
+CONFIG_NET_RESOLV_ENTRIES=4
 
 #
 # Stack and heap information
diff --git a/nuttx/configs/m68332evb/defconfig b/nuttx/configs/m68332evb/defconfig
index 2621de854..15ba43500 100644
--- a/nuttx/configs/m68332evb/defconfig
+++ b/nuttx/configs/m68332evb/defconfig
@@ -239,48 +239,50 @@ CONFIG_PREALLOC_WDOGS=32
 CONFIG_PREALLOC_TIMERS=8
 
 #
-# TCP/IP support via uIP
-# CONFIG_NET_UIP - Enable or disable all uIP features
-# CONFIG_NET_UIP_IPv6 - Build in support for IPv6
-# CONFIG_UIP_MAX_CONNECTIONS - Maximum number of TCP connections
-# CONFIG_UIP_MAX_LISTENPORTS - Maximum number of listening TCP ports
-# CONFIG_UIP_BUFFER_SIZE - uIP buffer size
-# CONFIG_UIP_LOGGING - Logging on or off
-# CONFIG_UIP_UDP - UDP support on or off
-# CONFIG_UIP_UDP_CHECKSUMS - UDP checksums on or off
-# CONFIG_UIP_UDP_CONNS - The maximum amount of concurrent UDP connections
-# CONFIG_UIP_STATISTICS - uIP statistics on or off
-# CONFIG_UIP_PINGADDRCONF - Use "ping" packet for setting IP address
-# CONFIG_UIP_RECEIVE_WINDOW - The size of the advertised receiver's window
-# CONFIG_UIP_ARPTAB_SIZE - The size of the ARP table
-# CONFIG_UIP_BROADCAST - Broadcast support
-# CONFIG_UIP_LLH_LEN - The link level header length
-# CONFIG_UIP_EXTERNAL_BUFFER - Incoming packet buffer (uip_buf) is defined externally
-# CONFIG_UIP_FWCACHE_SIZE - number of packets to remember when looking for duplicates
-CONFIG_NET_UIP=n
-CONFIG_NET_UIP_IPv6=n
-CONFIG_UIP_MAX_CONNECTIONS=40
-CONFIG_UIP_MAX_LISTENPORTS=40
-CONFIG_UIP_BUFFER_SIZE=420
-CONFIG_UIP_LOGGING=y
-CONFIG_UIP_UDP=n
-CONFIG_UIP_UDP_CHECKSUMS=y
-#CONFIG_UIP_UDP_CONNS=10
-CONFIG_UIP_STATISTICS=y
-#CONFIG_UIP_PINGADDRCONF=0
-#CONFIG_UIP_RECEIVE_WINDOW=
-#CONFIG_UIP_ARPTAB_SIZE=8
-CONFIG_UIP_BROADCAST=n
-#CONFIG_UIP_LLH_LEN=14
-CONFIG_UIP_EXTERNAL_BUFFER=n
-#CONFIG_UIP_FWCACHE_SIZE=2
+# TCP/IP and UDP support via uIP
+# CONFIG_NET - Enable or disable all network features
+# CONFIG_NET_IPv6 - Build in support for IPv6
+# CONFIG_NSOCKET_DESCRIPTORS - Maximum number of socket descriptors per task/thread.
+# CONFIG_NET_MAX_CONNECTIONS - Maximum number of TCP connections
+# CONFIG_NET_MAX_LISTENPORTS - Maximum number of listening TCP ports
+# CONFIG_NET_BUFFER_SIZE - uIP buffer size
+# CONFIG_NET_LOGGING - Logging on or off
+# CONFIG_NET_UDP - UDP support on or off
+# CONFIG_NET_UDP_CHECKSUMS - UDP checksums on or off
+# CONFIG_NET_UDP_CONNS - The maximum amount of concurrent UDP connections
+# CONFIG_NET_STATISTICS - uIP statistics on or off
+# CONFIG_NET_PINGADDRCONF - Use "ping" packet for setting IP address
+# CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window
+# CONFIG_NET_ARPTAB_SIZE - The size of the ARP table
+# CONFIG_NET_BROADCAST - Broadcast support
+# CONFIG_NET_LLH_LEN - The link level header length
+# CONFIG_NET_EXTERNAL_BUFFER - Incoming packet buffer (uip_buf) is defined externally
+# CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates
+CONFIG_NET=n
+CONFIG_NET_IPv6=n
+CONFIG_NSOCKET_DESCRIPTORS=0
+CONFIG_NET_MAX_CONNECTIONS=40
+CONFIG_NET_MAX_LISTENPORTS=40
+CONFIG_NET_BUFFER_SIZE=420
+CONFIG_NET_LOGGING=y
+CONFIG_NET_UDP=n
+CONFIG_NET_UDP_CHECKSUMS=y
+#CONFIG_NET_UDP_CONNS=10
+CONFIG_NET_STATISTICS=y
+#CONFIG_NET_PINGADDRCONF=0
+#CONFIG_NET_RECEIVE_WINDOW=
+#CONFIG_NET_ARPTAB_SIZE=8
+CONFIG_NET_BROADCAST=n
+#CONFIG_NET_LLH_LEN=14
+CONFIG_NET_EXTERNAL_BUFFER=n
+#CONFIG_NET_FWCACHE_SIZE=2
 
 #
 # UIP Network Utilities
-# CONFIG_UIP_DHCP_LIGHT - Reduces size of DHCP
-# CONFIG_UIP_RESOLV_ENTRIES - Number of resolver entries
-CONFIG_UIP_DHCP_LIGHT=n
-CONFIG_UIP_RESOLV_ENTRIES=4
+# CONFIG_NET_DHCP_LIGHT - Reduces size of DHCP
+# CONFIG_NET_RESOLV_ENTRIES - Number of resolver entries
+CONFIG_NET_DHCP_LIGHT=n
+CONFIG_NET_RESOLV_ENTRIES=4
 
 #
 # Stack and heap information
diff --git a/nuttx/configs/mcu123-lpc214x/defconfig b/nuttx/configs/mcu123-lpc214x/defconfig
index 40692b853..f8874256a 100644
--- a/nuttx/configs/mcu123-lpc214x/defconfig
+++ b/nuttx/configs/mcu123-lpc214x/defconfig
@@ -263,48 +263,50 @@ CONFIG_PREALLOC_WDOGS=32
 CONFIG_PREALLOC_TIMERS=8
 
 #
-# TCP/IP support via uIP
-# CONFIG_NET_UIP - Enable or disable all uIP features
-# CONFIG_NET_UIP_IPv6 - Build in support for IPv6
-# CONFIG_UIP_MAX_CONNECTIONS - Maximum number of TCP connections
-# CONFIG_UIP_MAX_LISTENPORTS - Maximum number of listening TCP ports
-# CONFIG_UIP_BUFFER_SIZE - uIP buffer size
-# CONFIG_UIP_LOGGING - Logging on or off
-# CONFIG_UIP_UDP - UDP support on or off
-# CONFIG_UIP_UDP_CHECKSUMS - UDP checksums on or off
-# CONFIG_UIP_UDP_CONNS - The maximum amount of concurrent UDP connections
-# CONFIG_UIP_STATISTICS - uIP statistics on or off
-# CONFIG_UIP_PINGADDRCONF - Use "ping" packet for setting IP address
-# CONFIG_UIP_RECEIVE_WINDOW - The size of the advertised receiver's window
-# CONFIG_UIP_ARPTAB_SIZE - The size of the ARP table
-# CONFIG_UIP_BROADCAST - Broadcast support
-# CONFIG_UIP_LLH_LEN - The link level header length
-# CONFIG_UIP_EXTERNAL_BUFFER - Incoming packet buffer (uip_buf) is defined externally
-# CONFIG_UIP_FWCACHE_SIZE - number of packets to remember when looking for duplicates
-CONFIG_NET_UIP=n
-CONFIG_NET_UIP_IPv6=n
-CONFIG_UIP_MAX_CONNECTIONS=40
-CONFIG_UIP_MAX_LISTENPORTS=40
-CONFIG_UIP_BUFFER_SIZE=420
-CONFIG_UIP_LOGGING=y
-CONFIG_UIP_UDP=n
-CONFIG_UIP_UDP_CHECKSUMS=y
-#CONFIG_UIP_UDP_CONNS=10
-CONFIG_UIP_STATISTICS=y
-#CONFIG_UIP_PINGADDRCONF=0
-#CONFIG_UIP_RECEIVE_WINDOW=
-#CONFIG_UIP_ARPTAB_SIZE=8
-CONFIG_UIP_BROADCAST=n
-#CONFIG_UIP_LLH_LEN=14
-CONFIG_UIP_EXTERNAL_BUFFER=n
-#CONFIG_UIP_FWCACHE_SIZE=2
+# TCP/IP and UDP support via uIP
+# CONFIG_NET - Enable or disable all network features
+# CONFIG_NET_IPv6 - Build in support for IPv6
+# CONFIG_NSOCKET_DESCRIPTORS - Maximum number of socket descriptors per task/thread.
+# CONFIG_NET_MAX_CONNECTIONS - Maximum number of TCP connections
+# CONFIG_NET_MAX_LISTENPORTS - Maximum number of listening TCP ports
+# CONFIG_NET_BUFFER_SIZE - uIP buffer size
+# CONFIG_NET_LOGGING - Logging on or off
+# CONFIG_NET_UDP - UDP support on or off
+# CONFIG_NET_UDP_CHECKSUMS - UDP checksums on or off
+# CONFIG_NET_UDP_CONNS - The maximum amount of concurrent UDP connections
+# CONFIG_NET_STATISTICS - uIP statistics on or off
+# CONFIG_NET_PINGADDRCONF - Use "ping" packet for setting IP address
+# CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window
+# CONFIG_NET_ARPTAB_SIZE - The size of the ARP table
+# CONFIG_NET_BROADCAST - Broadcast support
+# CONFIG_NET_LLH_LEN - The link level header length
+# CONFIG_NET_EXTERNAL_BUFFER - Incoming packet buffer (uip_buf) is defined externally
+# CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates
+CONFIG_NET=n
+CONFIG_NET_IPv6=n
+CONFIG_NSOCKET_DESCRIPTORS=0
+CONFIG_NET_MAX_CONNECTIONS=40
+CONFIG_NET_MAX_LISTENPORTS=40
+CONFIG_NET_BUFFER_SIZE=420
+CONFIG_NET_LOGGING=y
+CONFIG_NET_UDP=n
+CONFIG_NET_UDP_CHECKSUMS=y
+#CONFIG_NET_UDP_CONNS=10
+CONFIG_NET_STATISTICS=y
+#CONFIG_NET_PINGADDRCONF=0
+#CONFIG_NET_RECEIVE_WINDOW=
+#CONFIG_NET_ARPTAB_SIZE=8
+CONFIG_NET_BROADCAST=n
+#CONFIG_NET_LLH_LEN=14
+CONFIG_NET_EXTERNAL_BUFFER=n
+#CONFIG_NET_FWCACHE_SIZE=2
 
 #
 # UIP Network Utilities
-# CONFIG_UIP_DHCP_LIGHT - Reduces size of DHCP
-# CONFIG_UIP_RESOLV_ENTRIES - Number of resolver entries
-CONFIG_UIP_DHCP_LIGHT=n
-CONFIG_UIP_RESOLV_ENTRIES=4
+# CONFIG_NET_DHCP_LIGHT - Reduces size of DHCP
+# CONFIG_NET_RESOLV_ENTRIES - Number of resolver entries
+CONFIG_NET_DHCP_LIGHT=n
+CONFIG_NET_RESOLV_ENTRIES=4
 
 #
 # Stack and heap information
diff --git a/nuttx/configs/ntosd-dm320/defconfig b/nuttx/configs/ntosd-dm320/defconfig
index 0a95f364d..7e1d182f1 100644
--- a/nuttx/configs/ntosd-dm320/defconfig
+++ b/nuttx/configs/ntosd-dm320/defconfig
@@ -248,48 +248,50 @@ CONFIG_PREALLOC_WDOGS=32
 CONFIG_PREALLOC_TIMERS=8
 
 #
-# TCP/IP support via uIP
-# CONFIG_NET_UIP - Enable or disable all uIP features
-# CONFIG_NET_UIP_IPv6 - Build in support for IPv6
-# CONFIG_UIP_MAX_CONNECTIONS - Maximum number of TCP connections
-# CONFIG_UIP_MAX_LISTENPORTS - Maximum number of listening TCP ports
-# CONFIG_UIP_BUFFER_SIZE - uIP buffer size
-# CONFIG_UIP_LOGGING - Logging on or off
-# CONFIG_UIP_UDP - UDP support on or off
-# CONFIG_UIP_UDP_CHECKSUMS - UDP checksums on or off
-# CONFIG_UIP_UDP_CONNS - The maximum amount of concurrent UDP connections
-# CONFIG_UIP_STATISTICS - uIP statistics on or off
-# CONFIG_UIP_PINGADDRCONF - Use "ping" packet for setting IP address
-# CONFIG_UIP_RECEIVE_WINDOW - The size of the advertised receiver's window
-# CONFIG_UIP_ARPTAB_SIZE - The size of the ARP table
-# CONFIG_UIP_BROADCAST - Broadcast support
-# CONFIG_UIP_LLH_LEN - The link level header length
-# CONFIG_UIP_EXTERNAL_BUFFER - Incoming packet buffer (uip_buf) is defined externally
-# CONFIG_UIP_FWCACHE_SIZE - number of packets to remember when looking for duplicates
-CONFIG_NET_UIP=y
-CONFIG_NET_UIP_IPv6=n
-CONFIG_UIP_MAX_CONNECTIONS=40
-CONFIG_UIP_MAX_LISTENPORTS=40
-CONFIG_UIP_BUFFER_SIZE=420
-CONFIG_UIP_LOGGING=y
-CONFIG_UIP_UDP=n
-CONFIG_UIP_UDP_CHECKSUMS=y
-#CONFIG_UIP_UDP_CONNS=10
-CONFIG_UIP_STATISTICS=y
-#CONFIG_UIP_PINGADDRCONF=0
-#CONFIG_UIP_RECEIVE_WINDOW=
-#CONFIG_UIP_ARPTAB_SIZE=8
-CONFIG_UIP_BROADCAST=n
-#CONFIG_UIP_LLH_LEN=14
-CONFIG_UIP_EXTERNAL_BUFFER=n
-#CONFIG_UIP_FWCACHE_SIZE=2
+# TCP/IP and UDP support via uIP
+# CONFIG_NET - Enable or disable all network features
+# CONFIG_NET_IPv6 - Build in support for IPv6
+# CONFIG_NSOCKET_DESCRIPTORS - Maximum number of socket descriptors per task/thread.
+# CONFIG_NET_MAX_CONNECTIONS - Maximum number of TCP connections
+# CONFIG_NET_MAX_LISTENPORTS - Maximum number of listening TCP ports
+# CONFIG_NET_BUFFER_SIZE - uIP buffer size
+# CONFIG_NET_LOGGING - Logging on or off
+# CONFIG_NET_UDP - UDP support on or off
+# CONFIG_NET_UDP_CHECKSUMS - UDP checksums on or off
+# CONFIG_NET_UDP_CONNS - The maximum amount of concurrent UDP connections
+# CONFIG_NET_STATISTICS - uIP statistics on or off
+# CONFIG_NET_PINGADDRCONF - Use "ping" packet for setting IP address
+# CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window
+# CONFIG_NET_ARPTAB_SIZE - The size of the ARP table
+# CONFIG_NET_BROADCAST - Broadcast support
+# CONFIG_NET_LLH_LEN - The link level header length
+# CONFIG_NET_EXTERNAL_BUFFER - Incoming packet buffer (uip_buf) is defined externally
+# CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates
+CONFIG_NET=y
+CONFIG_NET_IPv6=n
+CONFIG_NSOCKET_DESCRIPTORS=0
+CONFIG_NET_MAX_CONNECTIONS=40
+CONFIG_NET_MAX_LISTENPORTS=40
+CONFIG_NET_BUFFER_SIZE=420
+CONFIG_NET_LOGGING=y
+CONFIG_NET_UDP=n
+CONFIG_NET_UDP_CHECKSUMS=y
+#CONFIG_NET_UDP_CONNS=10
+CONFIG_NET_STATISTICS=y
+#CONFIG_NET_PINGADDRCONF=0
+#CONFIG_NET_RECEIVE_WINDOW=
+#CONFIG_NET_ARPTAB_SIZE=8
+CONFIG_NET_BROADCAST=n
+#CONFIG_NET_LLH_LEN=14
+CONFIG_NET_EXTERNAL_BUFFER=n
+#CONFIG_NET_FWCACHE_SIZE=2
 
 #
 # UIP Network Utilities
-# CONFIG_UIP_DHCP_LIGHT - Reduces size of DHCP
-# CONFIG_UIP_RESOLV_ENTRIES - Number of resolver entries
-CONFIG_UIP_DHCP_LIGHT=n
-CONFIG_UIP_RESOLV_ENTRIES=4
+# CONFIG_NET_DHCP_LIGHT - Reduces size of DHCP
+# CONFIG_NET_RESOLV_ENTRIES - Number of resolver entries
+CONFIG_NET_DHCP_LIGHT=n
+CONFIG_NET_RESOLV_ENTRIES=4
 
 #
 # Stack and heap information
diff --git a/nuttx/configs/pjrc-8051/defconfig b/nuttx/configs/pjrc-8051/defconfig
index 3857c85d8..1af793bd4 100644
--- a/nuttx/configs/pjrc-8051/defconfig
+++ b/nuttx/configs/pjrc-8051/defconfig
@@ -236,48 +236,50 @@ CONFIG_PREALLOC_WDOGS=4
 CONFIG_PREALLOC_TIMERS=0
 
 #
-# TCP/IP support via uIP
-# CONFIG_NET_UIP - Enable or disable all uIP features
-# CONFIG_NET_UIP_IPv6 - Build in support for IPv6
-# CONFIG_UIP_MAX_CONNECTIONS - Maximum number of TCP connections
-# CONFIG_UIP_MAX_LISTENPORTS - Maximum number of listening TCP ports
-# CONFIG_UIP_BUFFER_SIZE - uIP buffer size
-# CONFIG_UIP_LOGGING - Logging on or off
-# CONFIG_UIP_UDP - UDP support on or off
-# CONFIG_UIP_UDP_CHECKSUMS - UDP checksums on or off
-# CONFIG_UIP_UDP_CONNS - The maximum amount of concurrent UDP connections
-# CONFIG_UIP_STATISTICS - uIP statistics on or off
-# CONFIG_UIP_PINGADDRCONF - Use "ping" packet for setting IP address
-# CONFIG_UIP_RECEIVE_WINDOW - The size of the advertised receiver's window
-# CONFIG_UIP_ARPTAB_SIZE - The size of the ARP table
-# CONFIG_UIP_BROADCAST - Broadcast support
-# CONFIG_UIP_LLH_LEN - The link level header length
-# CONFIG_UIP_EXTERNAL_BUFFER - Incoming packet buffer (uip_buf) is defined externally
-# CONFIG_UIP_FWCACHE_SIZE - number of packets to remember when looking for duplicates
-CONFIG_NET_UIP=y
-CONFIG_NET_UIP_IPv6=n
-CONFIG_UIP_MAX_CONNECTIONS=40
-CONFIG_UIP_MAX_LISTENPORTS=40
-CONFIG_UIP_BUFFER_SIZE=420
-CONFIG_UIP_LOGGING=y
-CONFIG_UIP_UDP=n
-CONFIG_UIP_UDP_CHECKSUMS=y
-#CONFIG_UIP_UDP_CONNS=10
-CONFIG_UIP_STATISTICS=y
-#CONFIG_UIP_PINGADDRCONF=0
-#CONFIG_UIP_RECEIVE_WINDOW=
-#CONFIG_UIP_ARPTAB_SIZE=8
-CONFIG_UIP_BROADCAST=n
-#CONFIG_UIP_LLH_LEN=14
-CONFIG_UIP_EXTERNAL_BUFFER=n
-#CONFIG_UIP_FWCACHE_SIZE=2
+# TCP/IP and UDP support via uIP
+# CONFIG_NET - Enable or disable all network features
+# CONFIG_NET_IPv6 - Build in support for IPv6
+# CONFIG_NSOCKET_DESCRIPTORS - Maximum number of socket descriptors per task/thread.
+# CONFIG_NET_MAX_CONNECTIONS - Maximum number of TCP connections
+# CONFIG_NET_MAX_LISTENPORTS - Maximum number of listening TCP ports
+# CONFIG_NET_BUFFER_SIZE - uIP buffer size
+# CONFIG_NET_LOGGING - Logging on or off
+# CONFIG_NET_UDP - UDP support on or off
+# CONFIG_NET_UDP_CHECKSUMS - UDP checksums on or off
+# CONFIG_NET_UDP_CONNS - The maximum amount of concurrent UDP connections
+# CONFIG_NET_STATISTICS - uIP statistics on or off
+# CONFIG_NET_PINGADDRCONF - Use "ping" packet for setting IP address
+# CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window
+# CONFIG_NET_ARPTAB_SIZE - The size of the ARP table
+# CONFIG_NET_BROADCAST - Broadcast support
+# CONFIG_NET_LLH_LEN - The link level header length
+# CONFIG_NET_EXTERNAL_BUFFER - Incoming packet buffer (uip_buf) is defined externally
+# CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates
+CONFIG_NET=y
+CONFIG_NET_IPv6=n
+CONFIG_NSOCKET_DESCRIPTORS=0
+CONFIG_NET_MAX_CONNECTIONS=40
+CONFIG_NET_MAX_LISTENPORTS=40
+CONFIG_NET_BUFFER_SIZE=420
+CONFIG_NET_LOGGING=y
+CONFIG_NET_UDP=n
+CONFIG_NET_UDP_CHECKSUMS=y
+#CONFIG_NET_UDP_CONNS=10
+CONFIG_NET_STATISTICS=y
+#CONFIG_NET_PINGADDRCONF=0
+#CONFIG_NET_RECEIVE_WINDOW=
+#CONFIG_NET_ARPTAB_SIZE=8
+CONFIG_NET_BROADCAST=n
+#CONFIG_NET_LLH_LEN=14
+CONFIG_NET_EXTERNAL_BUFFER=n
+#CONFIG_NET_FWCACHE_SIZE=2
 
 #
 # UIP Network Utilities
-# CONFIG_UIP_DHCP_LIGHT - Reduces size of DHCP
-# CONFIG_UIP_RESOLV_ENTRIES - Number of resolver entries
-CONFIG_UIP_DHCP_LIGHT=n
-CONFIG_UIP_RESOLV_ENTRIES=4
+# CONFIG_NET_DHCP_LIGHT - Reduces size of DHCP
+# CONFIG_NET_RESOLV_ENTRIES - Number of resolver entries
+CONFIG_NET_DHCP_LIGHT=n
+CONFIG_NET_RESOLV_ENTRIES=4
 
 #
 # Stack and heap information
diff --git a/nuttx/configs/sim/defconfig b/nuttx/configs/sim/defconfig
index e2cd2a3a9..8dff468a9 100644
--- a/nuttx/configs/sim/defconfig
+++ b/nuttx/configs/sim/defconfig
@@ -210,48 +210,50 @@ CONFIG_PREALLOC_TIMERS=8
 CONFIG_FS_FAT=y
 
 #
-# TCP/IP support via uIP
-# CONFIG_NET_UIP - Enable or disable all uIP features
-# CONFIG_NET_UIP_IPv6 - Build in support for IPv6
-# CONFIG_UIP_MAX_CONNECTIONS - Maximum number of TCP connections
-# CONFIG_UIP_MAX_LISTENPORTS - Maximum number of listening TCP ports
-# CONFIG_UIP_BUFFER_SIZE - uIP buffer size
-# CONFIG_UIP_LOGGING - Logging on or off
-# CONFIG_UIP_UDP - UDP support on or off
-# CONFIG_UIP_UDP_CHECKSUMS - UDP checksums on or off
-# CONFIG_UIP_UDP_CONNS - The maximum amount of concurrent UDP connections
-# CONFIG_UIP_STATISTICS - uIP statistics on or off
-# CONFIG_UIP_PINGADDRCONF - Use "ping" packet for setting IP address
-# CONFIG_UIP_RECEIVE_WINDOW - The size of the advertised receiver's window
-# CONFIG_UIP_ARPTAB_SIZE - The size of the ARP table
-# CONFIG_UIP_BROADCAST - Broadcast support
-# CONFIG_UIP_LLH_LEN - The link level header length
-# CONFIG_UIP_EXTERNAL_BUFFER - Incoming packet buffer (uip_buf) is defined externally
-# CONFIG_UIP_FWCACHE_SIZE - number of packets to remember when looking for duplicates
-CONFIG_NET_UIP=n
-CONFIG_NET_UIP_IPv6=n
-CONFIG_UIP_MAX_CONNECTIONS=40
-CONFIG_UIP_MAX_LISTENPORTS=40
-CONFIG_UIP_BUFFER_SIZE=420
-CONFIG_UIP_LOGGING=y
-CONFIG_UIP_UDP=n
-CONFIG_UIP_UDP_CHECKSUMS=y
-#CONFIG_UIP_UDP_CONNS=10
-CONFIG_UIP_STATISTICS=y
-#CONFIG_UIP_PINGADDRCONF=0
-#CONFIG_UIP_RECEIVE_WINDOW=
-#CONFIG_UIP_ARPTAB_SIZE=8
-CONFIG_UIP_BROADCAST=n
-#CONFIG_UIP_LLH_LEN=14
-CONFIG_UIP_EXTERNAL_BUFFER=n
-#CONFIG_UIP_FWCACHE_SIZE=2
+# TCP/IP and UDP support via uIP
+# CONFIG_NET - Enable or disable all network features
+# CONFIG_NET_IPv6 - Build in support for IPv6
+# CONFIG_NSOCKET_DESCRIPTORS - Maximum number of socket descriptors per task/thread.
+# CONFIG_NET_MAX_CONNECTIONS - Maximum number of TCP connections
+# CONFIG_NET_MAX_LISTENPORTS - Maximum number of listening TCP ports
+# CONFIG_NET_BUFFER_SIZE - uIP buffer size
+# CONFIG_NET_LOGGING - Logging on or off
+# CONFIG_NET_UDP - UDP support on or off
+# CONFIG_NET_UDP_CHECKSUMS - UDP checksums on or off
+# CONFIG_NET_UDP_CONNS - The maximum amount of concurrent UDP connections
+# CONFIG_NET_STATISTICS - uIP statistics on or off
+# CONFIG_NET_PINGADDRCONF - Use "ping" packet for setting IP address
+# CONFIG_NET_RECEIVE_WINDOW - The size of the advertised receiver's window
+# CONFIG_NET_ARPTAB_SIZE - The size of the ARP table
+# CONFIG_NET_BROADCAST - Broadcast support
+# CONFIG_NET_LLH_LEN - The link level header length
+# CONFIG_NET_EXTERNAL_BUFFER - Incoming packet buffer (uip_buf) is defined externally
+# CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates
+CONFIG_NET=n
+CONFIG_NET_IPv6=n
+CONFIG_NSOCKET_DESCRIPTORS=8
+CONFIG_NET_MAX_CONNECTIONS=40
+CONFIG_NET_MAX_LISTENPORTS=40
+CONFIG_NET_BUFFER_SIZE=420
+CONFIG_NET_LOGGING=y
+CONFIG_NET_UDP=n
+CONFIG_NET_UDP_CHECKSUMS=y
+#CONFIG_NET_UDP_CONNS=10
+CONFIG_NET_STATISTICS=y
+#CONFIG_NET_PINGADDRCONF=0
+#CONFIG_NET_RECEIVE_WINDOW=
+#CONFIG_NET_ARPTAB_SIZE=8
+CONFIG_NET_BROADCAST=n
+#CONFIG_NET_LLH_LEN=14
+CONFIG_NET_EXTERNAL_BUFFER=n
+#CONFIG_NET_FWCACHE_SIZE=2
 
 #
 # UIP Network Utilities
-# CONFIG_UIP_DHCP_LIGHT - Reduces size of DHCP
-# CONFIG_UIP_RESOLV_ENTRIES - Number of resolver entries
-CONFIG_UIP_DHCP_LIGHT=n
-CONFIG_UIP_RESOLV_ENTRIES=4
+# CONFIG_NET_DHCP_LIGHT - Reduces size of DHCP
+# CONFIG_NET_RESOLV_ENTRIES - Number of resolver entries
+CONFIG_NET_DHCP_LIGHT=n
+CONFIG_NET_RESOLV_ENTRIES=4
 
 #
 # Stack and heap information