Rename uip_driver_s net_driver_s

65 files changed, 188 insertions, 187 deletions

diff --git a/nuttx/net/README.txt b/nuttx/net/README.txt
index 7370944c1..f072c0786 100644
--- a/nuttx/net/README.txt
+++ b/nuttx/net/README.txt
@@ -1,38 +1,38 @@
-README

-======

-

-Directory Structure

-===================

-

-  nuttx/

-   |

-   `- net/

-       |

-       +- arp      - Address resolution protocol

-       +- devif    - Stack/device interface layer

-       +- icmp     - Internet Control Message Protocol

-       +- iob      - I/O buffering logic

-       +- netdev   - Socket network device interface

-       +- pkt      - "Raw" packet socket support

-       +- socket   - BSD socket interface

-       +- route    - Routing table support

-       +- tcp      - Transmission Control Protocol

-       +- udp      - User Datagram Protocol

-       `- utils    - Miscellaneous utility functions

-

-

-    +-------------------------------------------------------------+

-    |                   Application layer                         |

-    +-------------------------------------------------------------+

-    +-------------------------------------------------------------+

-    |                 Socket layer (socket/)                      |

-    +-------------------------------------------------------------+

-    +------------++-----------------------------------------------+

-    |  Network   ||  Protocol stacks (arp, icmp, pkt, tcp, udp)   |

-    |   Device   |+-----------------------------------------------+

-    | Interface  |+---------------------------------++------------+

-    | (netdev/)  ||Network Device Interface (devif/)|| Utilities  |

-    +------------++---------------------------------++------------+

-    +-------------------------------------------------------------+

-    |                  Network Device Drivers                     |

-    +-------------------------------------------------------------+

+README
+======
+
+Directory Structure
+===================
+
+  nuttx/
+   |
+   `- net/
+       |
+       +- arp      - Address resolution protocol
+       +- devif    - Stack/device interface layer
+       +- icmp     - Internet Control Message Protocol
+       +- iob      - I/O buffering logic
+       +- netdev   - Socket network device interface
+       +- pkt      - "Raw" packet socket support
+       +- socket   - BSD socket interface
+       +- route    - Routing table support
+       +- tcp      - Transmission Control Protocol
+       +- udp      - User Datagram Protocol
+       `- utils    - Miscellaneous utility functions
+
+
+    +-------------------------------------------------------------+
+    |                   Application layer                         |
+    +-------------------------------------------------------------+
+    +-------------------------------------------------------------+
+    |                 Socket layer (socket/)                      |
+    +-------------------------------------------------------------+
+    +------------++-----------------------------------------------+
+    |  Network   ||  Protocol stacks (arp, icmp, pkt, tcp, udp)   |
+    |   Device   |+-----------------------------------------------+
+    | Interface  |+---------------------------------++------------+
+    | (netdev/)  ||Network Device Interface (devif/)|| Utilities  |
+    +------------++---------------------------------++------------+
+    +-------------------------------------------------------------+
+    |                  Network Device Drivers                     |
+    +-------------------------------------------------------------+
diff --git a/nuttx/net/arp/arp_inout.c b/nuttx/net/arp/arp_inout.c
index d4fb1e0f9..57e081de4 100644
--- a/nuttx/net/arp/arp_inout.c
+++ b/nuttx/net/arp/arp_inout.c
@@ -195,7 +195,7 @@ static void arp_dump(struct arp_hdr_s *arp)
  */
 
 #ifdef CONFIG_NET_ARP_IPIN
-void arp_ipin(struct uip_driver_s *dev)
+void arp_ipin(struct net_driver_s *dev)
 {
   in_addr_t srcipaddr;
 
@@ -232,7 +232,7 @@ void arp_ipin(struct uip_driver_s *dev)
  * variable d_len.
  */
 
-void arp_arpin(struct uip_driver_s *dev)
+void arp_arpin(struct net_driver_s *dev)
 {
   struct arp_hdr_s *parp = ARPBUF;
   in_addr_t ipaddr;
@@ -321,7 +321,7 @@ void arp_arpin(struct uip_driver_s *dev)
  * buffer, and the length of the packet is in the field d_len.
  */
 
-void arp_out(struct uip_driver_s *dev)
+void arp_out(struct net_driver_s *dev)
 {
   const struct arp_entry *tabptr = NULL;
   struct arp_hdr_s       *parp   = ARPBUF;
diff --git a/nuttx/net/connect.c b/nuttx/net/connect.c
index cb0a1a606..0f3701066 100644
--- a/nuttx/net/connect.c
+++ b/nuttx/net/connect.c
@@ -80,7 +80,7 @@ static inline int psock_setup_callbacks(FAR struct socket *psock,
                                         FAR struct tcp_connect_s *pstate);
 static inline void psock_teardown_callbacks(FAR struct tcp_connect_s *pstate,
                                           int status);
-static uint16_t psock_connect_interrupt(FAR struct uip_driver_s *dev,
+static uint16_t psock_connect_interrupt(FAR struct net_driver_s *dev,
                                         FAR void *pvconn, FAR void *pvpriv,
                                         uint16_t flags);
 #ifdef CONFIG_NET_IPv6
@@ -181,7 +181,7 @@ static inline void psock_teardown_callbacks(FAR struct tcp_connect_s *pstate,
  ****************************************************************************/
 
 #ifdef CONFIG_NET_TCP
-static uint16_t psock_connect_interrupt(FAR struct uip_driver_s *dev,
+static uint16_t psock_connect_interrupt(FAR struct net_driver_s *dev,
                                         FAR void *pvconn, FAR void *pvpriv,
                                         uint16_t flags)
 {
diff --git a/nuttx/net/getsockname.c b/nuttx/net/getsockname.c
index 7d39f2cb8..fb05eb5af 100644
--- a/nuttx/net/getsockname.c
+++ b/nuttx/net/getsockname.c
@@ -100,7 +100,7 @@
 int getsockname(int sockfd, FAR struct sockaddr *addr, FAR socklen_t *addrlen)
 {
   FAR struct socket *psock = sockfd_socket(sockfd);
-  FAR struct uip_driver_s *dev;
+  FAR struct net_driver_s *dev;
 
 #if defined(CONFIG_NET_TCP) || defined(CONFIG_NET_UDP)
 #ifdef CONFIG_NET_IPv6
diff --git a/nuttx/net/icmp/icmp.h b/nuttx/net/icmp/icmp.h
index fe0376781..dd644d9ee 100644
--- a/nuttx/net/icmp/icmp.h
+++ b/nuttx/net/icmp/icmp.h
@@ -72,18 +72,18 @@ extern "C"
 
 /* Defined in icmp_input.c **************************************************/
 
-void icmp_input(FAR struct uip_driver_s *dev);
+void icmp_input(FAR struct net_driver_s *dev);
 
 /* Defined in icmp_poll.c ***************************************************/
 
 #ifdef CONFIG_NET_ICMP_PING
-void icmp_poll(FAR struct uip_driver_s *dev);
+void icmp_poll(FAR struct net_driver_s *dev);
 #endif /* CONFIG_NET_ICMP_PING */
 
 /* Defined in icmp_send.c ***************************************************/
 
 #ifdef CONFIG_NET_ICMP_PING
-void icmp_send(FAR struct uip_driver_s *dev, FAR uip_ipaddr_t *destaddr);
+void icmp_send(FAR struct net_driver_s *dev, FAR uip_ipaddr_t *destaddr);
 #endif /* CONFIG_NET_ICMP_PING */
 
 #undef EXTERN
diff --git a/nuttx/net/icmp/icmp_input.c b/nuttx/net/icmp/icmp_input.c
index 432582b70..2958b323f 100644
--- a/nuttx/net/icmp/icmp_input.c
+++ b/nuttx/net/icmp/icmp_input.c
@@ -103,7 +103,7 @@ FAR struct uip_callback_s *g_echocallback = NULL;
  *
  ****************************************************************************/
 
-void icmp_input(FAR struct uip_driver_s *dev)
+void icmp_input(FAR struct net_driver_s *dev)
 {
   FAR struct icmp_iphdr_s *picmp = ICMPBUF;
 
diff --git a/nuttx/net/icmp/icmp_ping.c b/nuttx/net/icmp/icmp_ping.c
index 5e46f76ce..0054f2096 100644
--- a/nuttx/net/icmp/icmp_ping.c
+++ b/nuttx/net/icmp/icmp_ping.c
@@ -152,7 +152,7 @@ static inline int ping_timeout(FAR struct icmp_ping_s *pstate)
  *
  ****************************************************************************/
 
-static uint16_t ping_interrupt(FAR struct uip_driver_s *dev, FAR void *conn,
+static uint16_t ping_interrupt(FAR struct net_driver_s *dev, FAR void *conn,
                                FAR void *pvpriv, uint16_t flags)
 {
   FAR struct icmp_ping_s *pstate = (struct icmp_ping_s *)pvpriv;
diff --git a/nuttx/net/icmp/icmp_poll.c b/nuttx/net/icmp/icmp_poll.c
index 2beab639d..af98e26f3 100644
--- a/nuttx/net/icmp/icmp_poll.c
+++ b/nuttx/net/icmp/icmp_poll.c
@@ -86,7 +86,7 @@
  *
  ****************************************************************************/
 
-void icmp_poll(FAR struct uip_driver_s *dev)
+void icmp_poll(FAR struct net_driver_s *dev)
 {
   /* Setup for the application callback */
 
diff --git a/nuttx/net/icmp/icmp_send.c b/nuttx/net/icmp/icmp_send.c
index a8fe09578..7ee1fb1fa 100644
--- a/nuttx/net/icmp/icmp_send.c
+++ b/nuttx/net/icmp/icmp_send.c
@@ -89,7 +89,7 @@
  *
  ****************************************************************************/
 
-void icmp_send(FAR struct uip_driver_s *dev, FAR uip_ipaddr_t *destaddr)
+void icmp_send(FAR struct net_driver_s *dev, FAR uip_ipaddr_t *destaddr)
 {
   FAR struct icmp_iphdr_s *picmp = ICMPBUF;
 
diff --git a/nuttx/net/igmp/igmp.h b/nuttx/net/igmp/igmp.h
index 1f33fb872..2285dbd8b 100644
--- a/nuttx/net/igmp/igmp.h
+++ b/nuttx/net/igmp/igmp.h
@@ -76,18 +76,18 @@ void igmp_initialize(void);
 
 /* Defined in igmp_input.c **************************************************/
 
-void igmp_input(struct uip_driver_s *dev);
+void igmp_input(struct net_driver_s *dev);
 
 /* Defined in igmp_group.c **************************************************/
 
 void igmp_grpinit(void);
-FAR struct igmp_group_s *igmp_grpalloc(FAR struct uip_driver_s *dev,
+FAR struct igmp_group_s *igmp_grpalloc(FAR struct net_driver_s *dev,
                                        FAR const uip_ipaddr_t *addr);
-FAR struct igmp_group_s *igmp_grpfind(FAR struct uip_driver_s *dev,
+FAR struct igmp_group_s *igmp_grpfind(FAR struct net_driver_s *dev,
                                       FAR const uip_ipaddr_t *addr);
-FAR struct igmp_group_s *igmp_grpallocfind(FAR struct uip_driver_s *dev,
+FAR struct igmp_group_s *igmp_grpallocfind(FAR struct net_driver_s *dev,
                                            FAR const uip_ipaddr_t *addr);
-void igmp_grpfree(FAR struct uip_driver_s *dev,
+void igmp_grpfree(FAR struct net_driver_s *dev,
                   FAR struct igmp_group_s *group);
 
 /* Defined in igmp_msg.c ****************************************************/
@@ -97,11 +97,11 @@ void igmp_waitmsg(FAR struct igmp_group_s *group, uint8_t msgid);
 
 /* Defined in igmp_poll.c ***************************************************/
 
-void igmp_poll(FAR struct uip_driver_s *dev);
+void igmp_poll(FAR struct net_driver_s *dev);
 
 /* Defined in igmp_send.c ***************************************************/
 
-void igmp_send(FAR struct uip_driver_s *dev, FAR struct igmp_group_s *group,
+void igmp_send(FAR struct net_driver_s *dev, FAR struct igmp_group_s *group,
                   FAR uip_ipaddr_t *dest);
 
 /* Defined in igmp_timer.c **************************************************/
@@ -113,8 +113,8 @@ bool igmp_cmptimer(FAR struct igmp_group_s *group, int maxticks);
 
 /* Defined in igmp_mcastmac *************************************************/
 
-void igmp_addmcastmac(FAR struct uip_driver_s *dev, FAR uip_ipaddr_t *ip);
-void igmp_removemcastmac(FAR struct uip_driver_s *dev, FAR uip_ipaddr_t *ip);
+void igmp_addmcastmac(FAR struct net_driver_s *dev, FAR uip_ipaddr_t *ip);
+void igmp_removemcastmac(FAR struct net_driver_s *dev, FAR uip_ipaddr_t *ip);
 
 #undef EXTERN
 #ifdef __cplusplus
diff --git a/nuttx/net/igmp/igmp_group.c b/nuttx/net/igmp/igmp_group.c
index 85bfa1a0c..f0b3e5399 100644
--- a/nuttx/net/igmp/igmp_group.c
+++ b/nuttx/net/igmp/igmp_group.c
@@ -219,7 +219,7 @@ void igmp_grpinit(void)
  *
  ****************************************************************************/
 
-FAR struct igmp_group_s *igmp_grpalloc(FAR struct uip_driver_s *dev,
+FAR struct igmp_group_s *igmp_grpalloc(FAR struct net_driver_s *dev,
                                        FAR const uip_ipaddr_t *addr)
 {
   FAR struct igmp_group_s *group;
@@ -282,7 +282,7 @@ FAR struct igmp_group_s *igmp_grpalloc(FAR struct uip_driver_s *dev,
  *
  ****************************************************************************/
 
-FAR struct igmp_group_s *igmp_grpfind(FAR struct uip_driver_s *dev,
+FAR struct igmp_group_s *igmp_grpfind(FAR struct net_driver_s *dev,
                                       FAR const uip_ipaddr_t *addr)
 {
   FAR struct igmp_group_s *group;
@@ -323,7 +323,7 @@ FAR struct igmp_group_s *igmp_grpfind(FAR struct uip_driver_s *dev,
  *
  ****************************************************************************/
 
-FAR struct igmp_group_s *igmp_grpallocfind(FAR struct uip_driver_s *dev,
+FAR struct igmp_group_s *igmp_grpallocfind(FAR struct net_driver_s *dev,
                                            FAR const uip_ipaddr_t *addr)
 {
   FAR struct igmp_group_s *group = igmp_grpfind(dev, addr);
@@ -349,7 +349,7 @@ FAR struct igmp_group_s *igmp_grpallocfind(FAR struct uip_driver_s *dev,
  *
  ****************************************************************************/
 
-void igmp_grpfree(FAR struct uip_driver_s *dev, FAR struct igmp_group_s *group)
+void igmp_grpfree(FAR struct net_driver_s *dev, FAR struct igmp_group_s *group)
 {
   net_lock_t flags;
 
diff --git a/nuttx/net/igmp/igmp_initialize.c b/nuttx/net/igmp/igmp_initialize.c
index 1d751c487..f0ea8c4b5 100644
--- a/nuttx/net/igmp/igmp_initialize.c
+++ b/nuttx/net/igmp/igmp_initialize.c
@@ -103,7 +103,7 @@ void igmp_initialize(void)
  *
  ****************************************************************************/
 
-void igmp_devinit(struct uip_driver_s *dev)
+void igmp_devinit(struct net_driver_s *dev)
 {
   nvdbg("IGMP initializing dev %p\n", dev);
   DEBUGASSERT(dev->grplist.head == NULL);
diff --git a/nuttx/net/igmp/igmp_input.c b/nuttx/net/igmp/igmp_input.c
index 241294d01..76061bb82 100644
--- a/nuttx/net/igmp/igmp_input.c
+++ b/nuttx/net/igmp/igmp_input.c
@@ -113,7 +113,7 @@
  *
  ****************************************************************************/
 
-void igmp_input(struct uip_driver_s *dev)
+void igmp_input(struct net_driver_s *dev)
 {
   FAR struct igmp_group_s *group;
   uip_ipaddr_t destipaddr;
diff --git a/nuttx/net/igmp/igmp_join.c b/nuttx/net/igmp/igmp_join.c
index a8d4a19d3..7e3540e07 100644
--- a/nuttx/net/igmp/igmp_join.c
+++ b/nuttx/net/igmp/igmp_join.c
@@ -122,7 +122,7 @@
  *
  ****************************************************************************/
 
-int igmp_joingroup(struct uip_driver_s *dev, FAR const struct in_addr *grpaddr)
+int igmp_joingroup(struct net_driver_s *dev, FAR const struct in_addr *grpaddr)
 {
   struct igmp_group_s *group;
 
diff --git a/nuttx/net/igmp/igmp_leave.c b/nuttx/net/igmp/igmp_leave.c
index 58e28771c..65cffc108 100644
--- a/nuttx/net/igmp/igmp_leave.c
+++ b/nuttx/net/igmp/igmp_leave.c
@@ -129,7 +129,7 @@
  *
  ****************************************************************************/
 
-int igmp_leavegroup(struct uip_driver_s *dev, FAR const struct in_addr *grpaddr)
+int igmp_leavegroup(struct net_driver_s *dev, FAR const struct in_addr *grpaddr)
 {
   struct igmp_group_s *group;
   net_lock_t flags;
diff --git a/nuttx/net/igmp/igmp_mcastmac.c b/nuttx/net/igmp/igmp_mcastmac.c
index b4de341c0..42dbf0407 100644
--- a/nuttx/net/igmp/igmp_mcastmac.c
+++ b/nuttx/net/igmp/igmp_mcastmac.c
@@ -99,7 +99,7 @@ static void uip_mcastmac(uip_ipaddr_t *ip, FAR uint8_t *mac)
  *
  ****************************************************************************/
 
-void igmp_addmcastmac(FAR struct uip_driver_s *dev, FAR uip_ipaddr_t *ip)
+void igmp_addmcastmac(FAR struct net_driver_s *dev, FAR uip_ipaddr_t *ip)
 {
   uint8_t mcastmac[6];
 
@@ -119,7 +119,7 @@ void igmp_addmcastmac(FAR struct uip_driver_s *dev, FAR uip_ipaddr_t *ip)
  *
  ****************************************************************************/
 
-void igmp_removemcastmac(FAR struct uip_driver_s *dev, FAR uip_ipaddr_t *ip)
+void igmp_removemcastmac(FAR struct net_driver_s *dev, FAR uip_ipaddr_t *ip)
 {
   uint8_t mcastmac[6];
 
diff --git a/nuttx/net/igmp/igmp_poll.c b/nuttx/net/igmp/igmp_poll.c
index bcc689523..48b4f39dc 100644
--- a/nuttx/net/igmp/igmp_poll.c
+++ b/nuttx/net/igmp/igmp_poll.c
@@ -79,7 +79,7 @@
  *
  ****************************************************************************/
 
-static inline void uip_schedsend(FAR struct uip_driver_s *dev, FAR struct igmp_group_s *group)
+static inline void uip_schedsend(FAR struct net_driver_s *dev, FAR struct igmp_group_s *group)
 {
   uip_ipaddr_t *dest;
 
@@ -142,7 +142,7 @@ static inline void uip_schedsend(FAR struct uip_driver_s *dev, FAR struct igmp_g
  *
  ****************************************************************************/
 
-void igmp_poll(FAR struct uip_driver_s *dev)
+void igmp_poll(FAR struct net_driver_s *dev)
 {
   FAR struct igmp_group_s *group;
 
diff --git a/nuttx/net/igmp/igmp_send.c b/nuttx/net/igmp/igmp_send.c
index 2398215b9..a73c16a86 100644
--- a/nuttx/net/igmp/igmp_send.c
+++ b/nuttx/net/igmp/igmp_send.c
@@ -120,7 +120,7 @@ static uint16_t igmp_chksum(FAR uint8_t *buffer, int buflen)
  *
  ****************************************************************************/
 
-void igmp_send(FAR struct uip_driver_s *dev, FAR struct igmp_group_s *group,
+void igmp_send(FAR struct net_driver_s *dev, FAR struct igmp_group_s *group,
                FAR uip_ipaddr_t *destipaddr)
 {
   nllvdbg("msgid: %02x destipaddr: %08x\n", group->msgid, (int)*destipaddr);
diff --git a/nuttx/net/net_close.c b/nuttx/net/net_close.c
index 5f5e3d710..a2c57b6ef 100644
--- a/nuttx/net/net_close.c
+++ b/nuttx/net/net_close.c
@@ -153,7 +153,7 @@ static inline int close_timeout(FAR struct tcp_close_s *pstate)
  ****************************************************************************/
 
 #ifdef CONFIG_NET_TCP
-static uint16_t netclose_interrupt(FAR struct uip_driver_s *dev,
+static uint16_t netclose_interrupt(FAR struct net_driver_s *dev,
                                    FAR void *pvconn, FAR void *pvpriv,
                                    uint16_t flags)
 {
diff --git a/nuttx/net/net_poll.c b/nuttx/net/net_poll.c
index f7d27de35..d865631a6 100644
--- a/nuttx/net/net_poll.c
+++ b/nuttx/net/net_poll.c
@@ -113,7 +113,7 @@ struct net_poll_s
  ****************************************************************************/
 
 #ifdef HAVE_NETPOLL
-static uint16_t poll_interrupt(FAR struct uip_driver_s *dev, FAR void *conn,
+static uint16_t poll_interrupt(FAR struct net_driver_s *dev, FAR void *conn,
                                FAR void *pvpriv, uint16_t flags)
 {
   FAR struct net_poll_s *info = (FAR struct net_poll_s *)pvpriv;
diff --git a/nuttx/net/net_sendfile.c b/nuttx/net/net_sendfile.c
index 6d6a4a7e4..c5f249b51 100644
--- a/nuttx/net/net_sendfile.c
+++ b/nuttx/net/net_sendfile.c
@@ -144,7 +144,7 @@ static inline int sendfile_timeout(FAR struct sendfile_s *pstate)
 }
 #endif /* CONFIG_NET_SOCKOPTS && !CONFIG_DISABLE_CLOCK */
 
-static uint16_t ack_interrupt(FAR struct uip_driver_s *dev, FAR void *pvconn,
+static uint16_t ack_interrupt(FAR struct net_driver_s *dev, FAR void *pvconn,
                               FAR void *pvpriv, uint16_t flags)
 {
   FAR struct sendfile_s *pstate = (FAR struct sendfile_s *)pvpriv;
@@ -223,7 +223,7 @@ static uint16_t ack_interrupt(FAR struct uip_driver_s *dev, FAR void *pvconn,
  *
  ****************************************************************************/
 
-static uint16_t sendfile_interrupt(FAR struct uip_driver_s *dev, FAR void *pvconn,
+static uint16_t sendfile_interrupt(FAR struct net_driver_s *dev, FAR void *pvconn,
                                    FAR void *pvpriv, uint16_t flags)
 {
   FAR struct tcp_conn_s *conn = (FAR struct tcp_conn_s*)pvconn;
diff --git a/nuttx/net/netdev/netdev.h b/nuttx/net/netdev/netdev.h
index 7761051f0..b867a3d5d 100644
--- a/nuttx/net/netdev/netdev.h
+++ b/nuttx/net/netdev/netdev.h
@@ -70,7 +70,7 @@ extern "C"
 /* List of registered Ethernet device drivers */
 
 #if CONFIG_NSOCKET_DESCRIPTORS > 0
-EXTERN struct uip_driver_s *g_netdevices;
+EXTERN struct net_driver_s *g_netdevices;
 #endif
 
 /****************************************************************************
@@ -88,13 +88,13 @@ void netdev_semgive(void);
 /* netdev_findbyname.c *******************************************************/
 
 #if CONFIG_NSOCKET_DESCRIPTORS > 0
-FAR struct uip_driver_s *netdev_findbyname(FAR const char *ifname);
+FAR struct net_driver_s *netdev_findbyname(FAR const char *ifname);
 #endif
 
 /* netdev_findbyaddr.c *******************************************************/
 
 #if CONFIG_NSOCKET_DESCRIPTORS > 0
-FAR struct uip_driver_s *netdev_findbyaddr(const uip_ipaddr_t addr);
+FAR struct net_driver_s *netdev_findbyaddr(const uip_ipaddr_t addr);
 #endif
 
 /* netdev_txnotify.c *********************************************************/
diff --git a/nuttx/net/netdev/netdev_carrier.c b/nuttx/net/netdev/netdev_carrier.c
index 07589a64a..fb5e7e4d7 100644
--- a/nuttx/net/netdev/netdev_carrier.c
+++ b/nuttx/net/netdev/netdev_carrier.c
@@ -94,7 +94,7 @@
  *
  ****************************************************************************/
 
-int netdev_carrier_on(FAR struct uip_driver_s *dev)
+int netdev_carrier_on(FAR struct net_driver_s *dev)
 {
   if (dev)
     {
@@ -120,7 +120,7 @@ int netdev_carrier_on(FAR struct uip_driver_s *dev)
  *
  ****************************************************************************/
 
-int netdev_carrier_off(FAR struct uip_driver_s *dev)
+int netdev_carrier_off(FAR struct net_driver_s *dev)
 {
   if (dev)
     {
diff --git a/nuttx/net/netdev/netdev_count.c b/nuttx/net/netdev/netdev_count.c
index 23aac4c99..1a67be883 100644
--- a/nuttx/net/netdev/netdev_count.c
+++ b/nuttx/net/netdev/netdev_count.c
@@ -91,7 +91,7 @@
 
 int netdev_count(void)
 {
-  struct uip_driver_s *dev;
+  struct net_driver_s *dev;
   int ndev;
 
   netdev_semtake();
diff --git a/nuttx/net/netdev/netdev_findbyaddr.c b/nuttx/net/netdev/netdev_findbyaddr.c
index 0abda865c..1966d99f5 100644
--- a/nuttx/net/netdev/netdev_findbyaddr.c
+++ b/nuttx/net/netdev/netdev_findbyaddr.c
@@ -94,9 +94,9 @@
  *
  ****************************************************************************/
 
-static FAR struct uip_driver_s *netdev_finddevice(const uip_ipaddr_t addr)
+static FAR struct net_driver_s *netdev_finddevice(const uip_ipaddr_t addr)
 {
-  struct uip_driver_s *dev;
+  struct net_driver_s *dev;
 
   /* Examine each registered network device */
 
@@ -147,9 +147,9 @@ static FAR struct uip_driver_s *netdev_finddevice(const uip_ipaddr_t addr)
  *
  ****************************************************************************/
 
-FAR struct uip_driver_s *netdev_findbyaddr(const uip_ipaddr_t addr)
+FAR struct net_driver_s *netdev_findbyaddr(const uip_ipaddr_t addr)
 {
-  struct uip_driver_s *dev;
+  struct net_driver_s *dev;
 #ifdef CONFIG_NET_ROUTE
   uip_ipaddr_t router;
   int ret;
diff --git a/nuttx/net/netdev/netdev_findbyname.c b/nuttx/net/netdev/netdev_findbyname.c
index de351404c..980808652 100644
--- a/nuttx/net/netdev/netdev_findbyname.c
+++ b/nuttx/net/netdev/netdev_findbyname.c
@@ -90,9 +90,9 @@
  *
  ****************************************************************************/
 
-FAR struct uip_driver_s *netdev_findbyname(const char *ifname)
+FAR struct net_driver_s *netdev_findbyname(const char *ifname)
 {
-  struct uip_driver_s *dev;
+  struct net_driver_s *dev;
   if (ifname)
     {
       netdev_semtake();
diff --git a/nuttx/net/netdev/netdev_foreach.c b/nuttx/net/netdev/netdev_foreach.c
index ccec01800..9a5eb491b 100644
--- a/nuttx/net/netdev/netdev_foreach.c
+++ b/nuttx/net/netdev/netdev_foreach.c
@@ -93,7 +93,7 @@
 
 int netdev_foreach(netdev_callback_t callback, void *arg)
 {
-  struct uip_driver_s *dev;
+  struct net_driver_s *dev;
   int ret = 0;
 
   if (callback)
diff --git a/nuttx/net/netdev/netdev_ioctl.c b/nuttx/net/netdev/netdev_ioctl.c
index 106476872..af555dda0 100644
--- a/nuttx/net/netdev/netdev_ioctl.c
+++ b/nuttx/net/netdev/netdev_ioctl.c
@@ -143,7 +143,7 @@ static void ioctl_setipaddr(FAR uip_ipaddr_t *outaddr, FAR const void *inaddr)
  *
  ****************************************************************************/
 
-static void ioctl_ifup(FAR struct uip_driver_s *dev)
+static void ioctl_ifup(FAR struct net_driver_s *dev)
 {
   /* Make sure that the device supports the d_ifup() method */
 
@@ -165,7 +165,7 @@ static void ioctl_ifup(FAR struct uip_driver_s *dev)
     }
 }
 
-static void ioctl_ifdown(FAR struct uip_driver_s *dev)
+static void ioctl_ifdown(FAR struct net_driver_s *dev)
 {
   /* Make sure that the device supports the d_ifdown() method */
 
@@ -201,7 +201,7 @@ static void ioctl_ifdown(FAR struct uip_driver_s *dev)
  *
  ****************************************************************************/
 
-static FAR struct uip_driver_s *netdev_ifrdev(FAR struct ifreq *req)
+static FAR struct net_driver_s *netdev_ifrdev(FAR struct ifreq *req)
 {
   if (!req)
     {
@@ -236,7 +236,7 @@ static FAR struct uip_driver_s *netdev_ifrdev(FAR struct ifreq *req)
 static int netdev_ifrioctl(FAR struct socket *psock, int cmd,
                            FAR struct ifreq *req)
 {
-  FAR struct uip_driver_s *dev;
+  FAR struct net_driver_s *dev;
   int ret = -EINVAL;
 
   nvdbg("cmd: %d\n", cmd);
@@ -463,7 +463,7 @@ static int netdev_ifrioctl(FAR struct socket *psock, int cmd,
  ****************************************************************************/
 
 #ifdef CONFIG_NET_IGMP
-static FAR struct uip_driver_s *netdev_imsfdev(FAR struct ip_msfilter *imsf)
+static FAR struct net_driver_s *netdev_imsfdev(FAR struct ip_msfilter *imsf)
 {
   if (!imsf)
     {
@@ -500,7 +500,7 @@ static FAR struct uip_driver_s *netdev_imsfdev(FAR struct ip_msfilter *imsf)
 static int netdev_imsfioctl(FAR struct socket *psock, int cmd,
                             FAR struct ip_msfilter *imsf)
 {
-  FAR struct uip_driver_s *dev;
+  FAR struct net_driver_s *dev;
   int ret = -EINVAL;
 
   nvdbg("cmd: %d\n", cmd);
diff --git a/nuttx/net/netdev/netdev_register.c b/nuttx/net/netdev/netdev_register.c
index da48bf7a3..c2e47e3be 100644
--- a/nuttx/net/netdev/netdev_register.c
+++ b/nuttx/net/netdev/netdev_register.c
@@ -81,7 +81,7 @@ static int g_next_devnum = 0;
 
 /* List of registered ethernet device drivers */
 
-struct uip_driver_s *g_netdevices = NULL;
+struct net_driver_s *g_netdevices = NULL;
 
 /****************************************************************************
  * Private Functions
@@ -109,7 +109,7 @@ struct uip_driver_s *g_netdevices = NULL;
  *
  ****************************************************************************/
 
-int netdev_register(FAR struct uip_driver_s *dev)
+int netdev_register(FAR struct net_driver_s *dev)
 {
   if (dev)
     {
diff --git a/nuttx/net/netdev/netdev_rxnotify.c b/nuttx/net/netdev/netdev_rxnotify.c
index 1187cd0d6..5473d934d 100644
--- a/nuttx/net/netdev/netdev_rxnotify.c
+++ b/nuttx/net/netdev/netdev_rxnotify.c
@@ -96,7 +96,7 @@ void netdev_rxnotify(const uip_ipaddr_t raddr)
 
   /* Find the device driver that serves the subnet of the remote address */
 
-  struct uip_driver_s *dev = netdev_findbyaddr(raddr);
+  struct net_driver_s *dev = netdev_findbyaddr(raddr);
 
   if (dev && dev->d_rxavail)
     {
diff --git a/nuttx/net/netdev/netdev_txnotify.c b/nuttx/net/netdev/netdev_txnotify.c
index d6aea425a..f044f2d24 100644
--- a/nuttx/net/netdev/netdev_txnotify.c
+++ b/nuttx/net/netdev/netdev_txnotify.c
@@ -95,7 +95,7 @@ void netdev_txnotify(const uip_ipaddr_t raddr)
 {
   /* Find the device driver that serves the subnet of the remote address */
 
-  struct uip_driver_s *dev = netdev_findbyaddr(raddr);
+  struct net_driver_s *dev = netdev_findbyaddr(raddr);
 
   if (dev && dev->d_txavail)
     {
diff --git a/nuttx/net/netdev/netdev_unregister.c b/nuttx/net/netdev/netdev_unregister.c
index 35108ba98..150e410f5 100644
--- a/nuttx/net/netdev/netdev_unregister.c
+++ b/nuttx/net/netdev/netdev_unregister.c
@@ -103,10 +103,10 @@
  *
  ****************************************************************************/
 
-int netdev_unregister(FAR struct uip_driver_s *dev)
+int netdev_unregister(FAR struct net_driver_s *dev)
 {
-  struct uip_driver_s *prev;
-  struct uip_driver_s *curr;
+  struct net_driver_s *prev;
+  struct net_driver_s *curr;
 
   if (dev)
     {
diff --git a/nuttx/net/pkt/pkt.h b/nuttx/net/pkt/pkt.h
index 6404fe748..900f631c2 100644
--- a/nuttx/net/pkt/pkt.h
+++ b/nuttx/net/pkt/pkt.h
@@ -83,14 +83,14 @@ struct pkt_conn_s *uip_nextpktconn(FAR struct pkt_conn_s *conn);
 
 /* Defined in pkt_callback.c ************************************************/
 
-uint16_t pkt_callback(FAR struct uip_driver_s *dev,
+uint16_t pkt_callback(FAR struct net_driver_s *dev,
                       FAR struct pkt_conn_s *conn, uint16_t flags);
 
 /* Defined in pkt_input.c ***************************************************/
 
 /* Defined in pkt_poll.c ****************************************************/
 
-void pkt_poll(FAR struct uip_driver_s *dev, FAR struct pkt_conn_s *conn);
+void pkt_poll(FAR struct net_driver_s *dev, FAR struct pkt_conn_s *conn);
 
 /****************************************************************************
  * Function: psock_pkt_send
diff --git a/nuttx/net/pkt/pkt_callback.c b/nuttx/net/pkt/pkt_callback.c
index 5e3123628..30dfecaf6 100644
--- a/nuttx/net/pkt/pkt_callback.c
+++ b/nuttx/net/pkt/pkt_callback.c
@@ -77,7 +77,7 @@
  *
  ****************************************************************************/
 
-uint16_t pkt_callback(FAR struct uip_driver_s *dev,
+uint16_t pkt_callback(FAR struct net_driver_s *dev,
                       FAR struct pkt_conn_s *conn, uint16_t flags)
 {
   nllvdbg("flags: %04x\n", flags);
diff --git a/nuttx/net/pkt/pkt_input.c b/nuttx/net/pkt/pkt_input.c
index dea9908f1..aaa1e1c89 100644
--- a/nuttx/net/pkt/pkt_input.c
+++ b/nuttx/net/pkt/pkt_input.c
@@ -97,7 +97,7 @@
  *
  ****************************************************************************/
 
-int pkt_input(struct uip_driver_s *dev)
+int pkt_input(struct net_driver_s *dev)
 {
   FAR struct pkt_conn_s *conn;
   FAR struct eth_hdr_s  *pbuf = (struct eth_hdr_s *)dev->d_buf;
diff --git a/nuttx/net/pkt/pkt_poll.c b/nuttx/net/pkt/pkt_poll.c
index ce6e0ebed..1db880bdb 100644
--- a/nuttx/net/pkt/pkt_poll.c
+++ b/nuttx/net/pkt/pkt_poll.c
@@ -94,7 +94,7 @@
  *
  ****************************************************************************/
 
-void pkt_poll(FAR struct uip_driver_s *dev, FAR struct pkt_conn_s *conn)
+void pkt_poll(FAR struct net_driver_s *dev, FAR struct pkt_conn_s *conn)
 {
   nlldbg("IN\n");
 
diff --git a/nuttx/net/pkt/pkt_send.c b/nuttx/net/pkt/pkt_send.c
index f063dc87a..bc2c2b33c 100644
--- a/nuttx/net/pkt/pkt_send.c
+++ b/nuttx/net/pkt/pkt_send.c
@@ -90,7 +90,7 @@ struct send_s
  * Function: psock_send_interrupt
  ****************************************************************************/
 
-static uint16_t psock_send_interrupt(FAR struct uip_driver_s *dev,
+static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev,
                                      FAR void *pvconn,
                                      FAR void *pvpriv, uint16_t flags)
 {
@@ -246,7 +246,7 @@ ssize_t psock_pkt_send(FAR struct socket *psock, FAR const void *buf,
       state.snd_cb = pkt_callbackalloc(conn);
       if (state.snd_cb)
         {
-          FAR struct uip_driver_s *dev;
+          FAR struct net_driver_s *dev;
 
           /* Set up the callback in the connection */
 
diff --git a/nuttx/net/recvfrom.c b/nuttx/net/recvfrom.c
index 65f8183ab..9c6c576fd 100644
--- a/nuttx/net/recvfrom.c
+++ b/nuttx/net/recvfrom.c
@@ -122,7 +122,7 @@ struct recvfrom_s
  ****************************************************************************/
 
 #if defined(CONFIG_NET_UDP) || defined(CONFIG_NET_TCP)
-static size_t recvfrom_newdata(FAR struct uip_driver_s *dev,
+static size_t recvfrom_newdata(FAR struct net_driver_s *dev,
                                FAR struct recvfrom_s *pstate)
 {
   size_t recvlen;
@@ -172,7 +172,7 @@ static size_t recvfrom_newdata(FAR struct uip_driver_s *dev,
  ****************************************************************************/
 
 #ifdef CONFIG_NET_PKT
-static void recvfrom_newpktdata(FAR struct uip_driver_s *dev,
+static void recvfrom_newpktdata(FAR struct net_driver_s *dev,
                                 FAR struct recvfrom_s *pstate)
 {
   size_t recvlen;
@@ -218,7 +218,7 @@ static void recvfrom_newpktdata(FAR struct uip_driver_s *dev,
  ****************************************************************************/
 
 #ifdef CONFIG_NET_TCP
-static inline void recvfrom_newtcpdata(FAR struct uip_driver_s *dev,
+static inline void recvfrom_newtcpdata(FAR struct net_driver_s *dev,
                                        FAR struct recvfrom_s *pstate)
 {
   /* Take as much data from the packet as we can */
@@ -290,7 +290,7 @@ static inline void recvfrom_newtcpdata(FAR struct uip_driver_s *dev,
  ****************************************************************************/
 
 #ifdef CONFIG_NET_UDP
-static inline void recvfrom_newudpdata(FAR struct uip_driver_s *dev,
+static inline void recvfrom_newudpdata(FAR struct net_driver_s *dev,
                                        FAR struct recvfrom_s *pstate)
 {
   /* Take as much data from the packet as we can */
@@ -472,7 +472,7 @@ static int recvfrom_timeout(struct recvfrom_s *pstate)
  ****************************************************************************/
 
 #ifdef CONFIG_NET_PKT
-static inline void recvfrom_pktsender(FAR struct uip_driver_s *dev,
+static inline void recvfrom_pktsender(FAR struct net_driver_s *dev,
                                       FAR struct recvfrom_s *pstate)
 {
 }
@@ -492,7 +492,7 @@ static inline void recvfrom_pktsender(FAR struct uip_driver_s *dev,
  ****************************************************************************/
 
 #ifdef CONFIG_NET_PKT
-static uint16_t recvfrom_pktinterrupt(FAR struct uip_driver_s *dev,
+static uint16_t recvfrom_pktinterrupt(FAR struct net_driver_s *dev,
                                       FAR void *conn, FAR void *pvpriv,
                                       uint16_t flags)
 {
@@ -560,7 +560,7 @@ static uint16_t recvfrom_pktinterrupt(FAR struct uip_driver_s *dev,
  ****************************************************************************/
 
 #ifdef CONFIG_NET_TCP
-static inline void recvfrom_tcpsender(FAR struct uip_driver_s *dev,
+static inline void recvfrom_tcpsender(FAR struct net_driver_s *dev,
                                       FAR struct recvfrom_s *pstate)
 {
 #ifdef CONFIG_NET_IPv6
@@ -604,7 +604,7 @@ static inline void recvfrom_tcpsender(FAR struct uip_driver_s *dev,
  ****************************************************************************/
 
 #ifdef CONFIG_NET_TCP
-static uint16_t recvfrom_tcpinterrupt(FAR struct uip_driver_s *dev,
+static uint16_t recvfrom_tcpinterrupt(FAR struct net_driver_s *dev,
                                       FAR void *conn, FAR void *pvpriv,
                                       uint16_t flags)
 {
@@ -807,7 +807,7 @@ static uint16_t recvfrom_tcpinterrupt(FAR struct uip_driver_s *dev,
  ****************************************************************************/
 
 #ifdef CONFIG_NET_UDP
-static inline void recvfrom_udpsender(struct uip_driver_s *dev, struct recvfrom_s *pstate)
+static inline void recvfrom_udpsender(struct net_driver_s *dev, struct recvfrom_s *pstate)
 {
 #ifdef CONFIG_NET_IPv6
   FAR struct sockaddr_in6 *infrom = pstate->rf_from;
@@ -850,7 +850,7 @@ static inline void recvfrom_udpsender(struct uip_driver_s *dev, struct recvfrom_
  ****************************************************************************/
 
 #ifdef CONFIG_NET_UDP
-static uint16_t recvfrom_udpinterrupt(struct uip_driver_s *dev, void *pvconn,
+static uint16_t recvfrom_udpinterrupt(struct net_driver_s *dev, void *pvconn,
                                       void *pvpriv, uint16_t flags)
 {
   struct recvfrom_s *pstate = (struct recvfrom_s *)pvpriv;
diff --git a/nuttx/net/route/netdev_router.c b/nuttx/net/route/netdev_router.c
index 81d091ba2..d62fe5f0f 100644
--- a/nuttx/net/route/netdev_router.c
+++ b/nuttx/net/route/netdev_router.c
@@ -57,7 +57,7 @@
 
 struct route_devmatch_s
 {
-  FAR struct uip_driver_s *dev; /* The route must use this device */
+  FAR struct net_driver_s *dev; /* The route must use this device */
   uip_ipaddr_t target;   /* The target IP address on an external network to match */
   uip_ipaddr_t router;   /* The IP address of the router on one of our networks*/
 };
@@ -84,7 +84,7 @@ struct route_devmatch_s
 static int net_devmatch(FAR struct net_route_s *route, FAR void *arg)
 {
   FAR struct route_devmatch_s *match = (FAR struct route_devmatch_s *)arg;
-  FAR struct uip_driver_s *dev = match->dev;
+  FAR struct net_driver_s *dev = match->dev;
 
   /* To match, (1) the masked target addresses must be the same, and (2) the
    * router address must like on the network provided by the device.
@@ -133,10 +133,10 @@ static int net_devmatch(FAR struct net_route_s *route, FAR void *arg)
  ****************************************************************************/
 
 #ifdef CONFIG_NET_IPv6
-void netdev_router(FAR struct uip_driver_s *dev, uip_ipaddr_t target,
+void netdev_router(FAR struct net_driver_s *dev, uip_ipaddr_t target,
                    uip_ipaddr_t router)
 #else
-void netdev_router(FAR struct uip_driver_s *dev, uip_ipaddr_t target,
+void netdev_router(FAR struct net_driver_s *dev, uip_ipaddr_t target,
                    FAR uip_ipaddr_t *router)
 #endif
 {
diff --git a/nuttx/net/route/route.h b/nuttx/net/route/route.h
index 140afdf5d..a91db2c47 100644
--- a/nuttx/net/route/route.h
+++ b/nuttx/net/route/route.h
@@ -229,13 +229,13 @@ int net_router(uip_ipaddr_t target, FAR uip_ipaddr_t *router);
  *
  ****************************************************************************/
 
-struct uip_driver_s;
+struct net_driver_s;
 
 #ifdef CONFIG_NET_IPv6
-void netdev_router(FAR struct uip_driver_s *dev, uip_ipaddr_t target,
+void netdev_router(FAR struct net_driver_s *dev, uip_ipaddr_t target,
                    uip_ipaddr_t router);
 #else
-void netdev_router(FAR struct uip_driver_s *dev, uip_ipaddr_t target,
+void netdev_router(FAR struct net_driver_s *dev, uip_ipaddr_t target,
                    FAR uip_ipaddr_t *router);
 #endif
 
diff --git a/nuttx/net/sendto.c b/nuttx/net/sendto.c
index b51e29874..e88f69175 100644
--- a/nuttx/net/sendto.c
+++ b/nuttx/net/sendto.c
@@ -163,7 +163,7 @@ static inline int send_timeout(FAR struct sendto_s *pstate)
  ****************************************************************************/
 
 #ifdef CONFIG_NET_UDP
-static uint16_t sendto_interrupt(struct uip_driver_s *dev, void *conn,
+static uint16_t sendto_interrupt(struct net_driver_s *dev, void *conn,
                                  void *pvpriv, uint16_t flags)
 {
   FAR struct sendto_s *pstate = (FAR struct sendto_s *)pvpriv;
diff --git a/nuttx/net/tcp/tcp.h b/nuttx/net/tcp/tcp.h
index ef75526de..3e4f193d4 100644
--- a/nuttx/net/tcp/tcp.h
+++ b/nuttx/net/tcp/tcp.h
@@ -90,42 +90,42 @@ void tcp_nextsequence(void);
 
 /* Defined in tcp_poll.c ****************************************************/
 
-void tcp_poll(FAR struct uip_driver_s *dev, FAR struct tcp_conn_s *conn);
+void tcp_poll(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn);
 
 /* Defined in tcp_timer.c ***************************************************/
 
-void tcp_timer(FAR struct uip_driver_s *dev, FAR struct tcp_conn_s *conn,
+void tcp_timer(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
                int hsec);
 
 /* Defined in tcp_listen.c **************************************************/
 
 void tcp_listeninit(void);
 bool tcp_islistener(uint16_t port);
-int tcp_accept_connection(FAR struct uip_driver_s *dev,
+int tcp_accept_connection(FAR struct net_driver_s *dev,
                           FAR struct tcp_conn_s *conn, uint16_t portno);
 
 /* Defined in tcp_send.c ****************************************************/
 
-void tcp_send(FAR struct uip_driver_s *dev, FAR struct tcp_conn_s *conn,
+void tcp_send(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
               uint16_t flags, uint16_t len);
-void tcp_reset(FAR struct uip_driver_s *dev);
-void tcp_ack(FAR struct uip_driver_s *dev, FAR struct tcp_conn_s *conn,
+void tcp_reset(FAR struct net_driver_s *dev);
+void tcp_ack(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
              uint8_t ack);
 
 /* Defined in tcp_appsend.c *************************************************/
 
-void tcp_appsend(FAR struct uip_driver_s *dev, FAR struct tcp_conn_s *conn,
+void tcp_appsend(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
                  uint16_t result);
-void tcp_rexmit(FAR struct uip_driver_s *dev, FAR struct tcp_conn_s *conn,
+void tcp_rexmit(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
                 uint16_t result);
 
 /* Defined in tcp_input.c ***************************************************/
 
-void tcp_input(FAR struct uip_driver_s *dev);
+void tcp_input(FAR struct net_driver_s *dev);
 
 /* Defined in tcp_callback.c ************************************************/
 
-uint16_t tcp_callback(FAR struct uip_driver_s *dev,
+uint16_t tcp_callback(FAR struct net_driver_s *dev,
                       FAR struct tcp_conn_s *conn, uint16_t flags);
 #ifdef CONFIG_NET_TCP_READAHEAD
 uint16_t tcp_datahandler(FAR struct tcp_conn_s *conn,
diff --git a/nuttx/net/tcp/tcp_appsend.c b/nuttx/net/tcp/tcp_appsend.c
index eb4214d55..f02049208 100644
--- a/nuttx/net/tcp/tcp_appsend.c
+++ b/nuttx/net/tcp/tcp_appsend.c
@@ -97,7 +97,7 @@
  *
  ****************************************************************************/
 
-void tcp_appsend(FAR struct uip_driver_s *dev, FAR struct tcp_conn_s *conn,
+void tcp_appsend(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
                  uint16_t result)
 {
   /* Handle the result based on the application response */
@@ -183,7 +183,7 @@ void tcp_appsend(FAR struct uip_driver_s *dev, FAR struct tcp_conn_s *conn,
  *
  ****************************************************************************/
 
-void tcp_rexmit(FAR struct uip_driver_s *dev, FAR struct tcp_conn_s *conn,
+void tcp_rexmit(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
                 uint16_t result)
 {
   nllvdbg("result: %04x d_sndlen: %d conn->unacked: %d\n",
diff --git a/nuttx/net/tcp/tcp_callback.c b/nuttx/net/tcp/tcp_callback.c
index f09bf995f..bbd886173 100644
--- a/nuttx/net/tcp/tcp_callback.c
+++ b/nuttx/net/tcp/tcp_callback.c
@@ -77,7 +77,7 @@
  ****************************************************************************/
 
 static inline uint16_t
-uip_dataevent(FAR struct uip_driver_s *dev, FAR struct tcp_conn_s *conn,
+uip_dataevent(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
               uint16_t flags)
 {
   uint16_t ret;
@@ -148,7 +148,7 @@ uip_dataevent(FAR struct uip_driver_s *dev, FAR struct tcp_conn_s *conn,
  *
  ****************************************************************************/
 
-uint16_t tcp_callback(FAR struct uip_driver_s *dev, FAR struct tcp_conn_s *conn,
+uint16_t tcp_callback(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
                       uint16_t flags)
 {
   /* Preserve the UIP_ACKDATA, UIP_CLOSE, and UIP_ABORT in the response.
diff --git a/nuttx/net/tcp/tcp_input.c b/nuttx/net/tcp/tcp_input.c
index 634343004..909996a23 100644
--- a/nuttx/net/tcp/tcp_input.c
+++ b/nuttx/net/tcp/tcp_input.c
@@ -98,7 +98,7 @@
  *
  ****************************************************************************/
 
-void tcp_input(struct uip_driver_s *dev)
+void tcp_input(struct net_driver_s *dev)
 {
   struct tcp_conn_s *conn = NULL;
   struct tcp_iphdr_s *pbuf = BUF;
diff --git a/nuttx/net/tcp/tcp_listen.c b/nuttx/net/tcp/tcp_listen.c
index 1b48dc2ee..be9324103 100644
--- a/nuttx/net/tcp/tcp_listen.c
+++ b/nuttx/net/tcp/tcp_listen.c
@@ -247,7 +247,7 @@ bool tcp_islistener(uint16_t portno)
  *
  ****************************************************************************/
 
-int tcp_accept_connection(FAR struct uip_driver_s *dev,
+int tcp_accept_connection(FAR struct net_driver_s *dev,
                           FAR struct tcp_conn_s *conn, uint16_t portno)
 {
   FAR struct tcp_conn_s *listener;
diff --git a/nuttx/net/tcp/tcp_poll.c b/nuttx/net/tcp/tcp_poll.c
index 3fc9609d7..465a3e253 100644
--- a/nuttx/net/tcp/tcp_poll.c
+++ b/nuttx/net/tcp/tcp_poll.c
@@ -94,7 +94,7 @@
  *
  ****************************************************************************/
 
-void tcp_poll(FAR struct uip_driver_s *dev, FAR struct tcp_conn_s *conn)
+void tcp_poll(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn)
 {
   uint8_t result;
 
diff --git a/nuttx/net/tcp/tcp_send.c b/nuttx/net/tcp/tcp_send.c
index 929ca1c9b..f404e9d59 100644
--- a/nuttx/net/tcp/tcp_send.c
+++ b/nuttx/net/tcp/tcp_send.c
@@ -91,7 +91,7 @@
  *
  ****************************************************************************/
 
-static void tcp_sendcomplete(FAR struct uip_driver_s *dev)
+static void tcp_sendcomplete(FAR struct net_driver_s *dev)
 {
   FAR struct tcp_iphdr_s *pbuf = BUF;
 
@@ -172,7 +172,7 @@ static void tcp_sendcomplete(FAR struct uip_driver_s *dev)
  *
  ****************************************************************************/
 
-static void tcp_sendcommon(FAR struct uip_driver_s *dev,
+static void tcp_sendcommon(FAR struct net_driver_s *dev,
                            FAR struct tcp_conn_s *conn)
 {
   FAR struct tcp_iphdr_s *pbuf = BUF;
@@ -233,7 +233,7 @@ static void tcp_sendcommon(FAR struct uip_driver_s *dev,
  *
  ****************************************************************************/
 
-void tcp_send(FAR struct uip_driver_s *dev, FAR struct tcp_conn_s *conn,
+void tcp_send(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
               uint16_t flags, uint16_t len)
 {
   FAR struct tcp_iphdr_s *pbuf = BUF;
@@ -261,7 +261,7 @@ void tcp_send(FAR struct uip_driver_s *dev, FAR struct tcp_conn_s *conn,
  *
  ****************************************************************************/
 
-void tcp_reset(FAR struct uip_driver_s *dev)
+void tcp_reset(FAR struct net_driver_s *dev)
 {
   FAR struct tcp_iphdr_s *pbuf = BUF;
   uint16_t tmp16;
@@ -344,7 +344,7 @@ void tcp_reset(FAR struct uip_driver_s *dev)
  *
  ****************************************************************************/
 
-void tcp_ack(FAR struct uip_driver_s *dev, FAR struct tcp_conn_s *conn,
+void tcp_ack(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
              uint8_t ack)
 {
   struct tcp_iphdr_s *pbuf = BUF;
diff --git a/nuttx/net/tcp/tcp_send_buffered.c b/nuttx/net/tcp/tcp_send_buffered.c
index 37359406f..d51a6efbf 100644
--- a/nuttx/net/tcp/tcp_send_buffered.c
+++ b/nuttx/net/tcp/tcp_send_buffered.c
@@ -213,7 +213,7 @@ static inline void psock_lost_connection(FAR struct socket *psock,
  *
  ****************************************************************************/
 
-static uint16_t psock_send_interrupt(FAR struct uip_driver_s *dev,
+static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev,
                                      FAR void *pvconn, FAR void *pvpriv,
                                      uint16_t flags)
 {
diff --git a/nuttx/net/tcp/tcp_send_unbuffered.c b/nuttx/net/tcp/tcp_send_unbuffered.c
index 0736b220c..39474cfc3 100644
--- a/nuttx/net/tcp/tcp_send_unbuffered.c
+++ b/nuttx/net/tcp/tcp_send_unbuffered.c
@@ -162,7 +162,7 @@ static inline int send_timeout(FAR struct send_s *pstate)
  *
  ****************************************************************************/
 
-static uint16_t tcpsend_interrupt(FAR struct uip_driver_s *dev,
+static uint16_t tcpsend_interrupt(FAR struct net_driver_s *dev,
                                   FAR void *pvconn,
                                   FAR void *pvpriv, uint16_t flags)
 {
diff --git a/nuttx/net/tcp/tcp_timer.c b/nuttx/net/tcp/tcp_timer.c
index 228abf6e3..87083aef6 100644
--- a/nuttx/net/tcp/tcp_timer.c
+++ b/nuttx/net/tcp/tcp_timer.c
@@ -96,7 +96,7 @@
  *
  ****************************************************************************/
 
-void tcp_timer(FAR struct uip_driver_s *dev, FAR struct tcp_conn_s *conn,
+void tcp_timer(FAR struct net_driver_s *dev, FAR struct tcp_conn_s *conn,
                int hsec)
 {
   uint8_t result;
diff --git a/nuttx/net/udp/Kconfig b/nuttx/net/udp/Kconfig
index 16b535c9c..d52f4f7a2 100644
--- a/nuttx/net/udp/Kconfig
+++ b/nuttx/net/udp/Kconfig
@@ -46,7 +46,7 @@ config NET_RXAVAIL
 		support retention of UDP packets in that RAM.  If the drivers
 		supports such a capability, this option may be enabled to use it.
 		NOTE:  If this option is enabled, the driver must support the
-		rxavail() method in the uip_driver_s structure.
+		rxavail() method in the net_driver_s structure.
 
 endif # NET_UDP
 endmenu # UDP Networking
diff --git a/nuttx/net/udp/udp.h b/nuttx/net/udp/udp.h
index 7ebaf19d2..803a28b49 100644
--- a/nuttx/net/udp/udp.h
+++ b/nuttx/net/udp/udp.h
@@ -81,19 +81,19 @@ FAR struct udp_conn_s *uip_nextudpconn(FAR struct udp_conn_s *conn);
 
 /* Defined in udp_poll.c ****************************************************/
 
-void udp_poll(FAR struct uip_driver_s *dev, FAR struct udp_conn_s *conn);
+void udp_poll(FAR struct net_driver_s *dev, FAR struct udp_conn_s *conn);
 
 /* Defined in udp_send.c ****************************************************/
 
-void udp_send(FAR struct uip_driver_s *dev, FAR struct udp_conn_s *conn);
+void udp_send(FAR struct net_driver_s *dev, FAR struct udp_conn_s *conn);
 
 /* Defined in udp_input.c ***************************************************/
 
-int udp_input(FAR struct uip_driver_s *dev);
+int udp_input(FAR struct net_driver_s *dev);
 
 /* Defined in udp_callback.c ************************************************/
 
-uint16_t udp_callback(FAR struct uip_driver_s *dev,
+uint16_t udp_callback(FAR struct net_driver_s *dev,
                       FAR struct udp_conn_s *conn, uint16_t flags);
 
 #undef EXTERN
diff --git a/nuttx/net/udp/udp_callback.c b/nuttx/net/udp/udp_callback.c
index 85edd388f..4c57db744 100644
--- a/nuttx/net/udp/udp_callback.c
+++ b/nuttx/net/udp/udp_callback.c
@@ -77,7 +77,7 @@
  *
  ****************************************************************************/
 
-uint16_t udp_callback(FAR struct uip_driver_s *dev,
+uint16_t udp_callback(FAR struct net_driver_s *dev,
                       FAR struct udp_conn_s *conn, uint16_t flags)
 {
   nllvdbg("flags: %04x\n", flags);
diff --git a/nuttx/net/udp/udp_input.c b/nuttx/net/udp/udp_input.c
index 61c1f80ed..43408f4cf 100644
--- a/nuttx/net/udp/udp_input.c
+++ b/nuttx/net/udp/udp_input.c
@@ -97,7 +97,7 @@
  *
  ****************************************************************************/
 
-int udp_input(FAR struct uip_driver_s *dev)
+int udp_input(FAR struct net_driver_s *dev)
 {
   FAR struct udp_conn_s *conn;
   FAR struct udp_iphdr_s *pbuf = UDPBUF;
diff --git a/nuttx/net/udp/udp_poll.c b/nuttx/net/udp/udp_poll.c
index cd0360468..6196fca2d 100644
--- a/nuttx/net/udp/udp_poll.c
+++ b/nuttx/net/udp/udp_poll.c
@@ -93,7 +93,7 @@
  *
  ****************************************************************************/
 
-void udp_poll(FAR struct uip_driver_s *dev, FAR struct udp_conn_s *conn)
+void udp_poll(FAR struct net_driver_s *dev, FAR struct udp_conn_s *conn)
 {
   /* Verify that the UDP connection is valid */
 
diff --git a/nuttx/net/udp/udp_send.c b/nuttx/net/udp/udp_send.c
index c7dee9374..db9b74dd6 100644
--- a/nuttx/net/udp/udp_send.c
+++ b/nuttx/net/udp/udp_send.c
@@ -95,7 +95,7 @@
  *
  ****************************************************************************/
 
-void udp_send(struct uip_driver_s *dev, struct udp_conn_s *conn)
+void udp_send(struct net_driver_s *dev, struct udp_conn_s *conn)
 {
   FAR struct udp_iphdr_s *pudpbuf = UDPBUF;
 
diff --git a/nuttx/net/uip/uip.h b/nuttx/net/uip/uip.h
index 07852e045..c0094f0d0 100644
--- a/nuttx/net/uip/uip.h
+++ b/nuttx/net/uip/uip.h
@@ -156,7 +156,7 @@ void uip_callbackfree(FAR struct uip_callback_s *cb,
  *
  ****************************************************************************/
 
-uint16_t uip_callbackexecute(FAR struct uip_driver_s *dev, FAR void *pvconn,
+uint16_t uip_callbackexecute(FAR struct net_driver_s *dev, FAR void *pvconn,
                              uint16_t flags, FAR struct uip_callback_s *list);
 
 /****************************************************************************
@@ -183,16 +183,16 @@ uint16_t uip_callbackexecute(FAR struct uip_driver_s *dev, FAR void *pvconn,
  *
  ****************************************************************************/
 
-void uip_send(FAR struct uip_driver_s *dev, FAR const void *buf, int len);
+void uip_send(FAR struct net_driver_s *dev, FAR const void *buf, int len);
 
 #ifdef CONFIG_NET_IOB
 struct iob_s;
-void uip_iobsend(FAR struct uip_driver_s *dev, FAR struct iob_s *buf,
+void uip_iobsend(FAR struct net_driver_s *dev, FAR struct iob_s *buf,
                  unsigned int len, unsigned int offset);
 #endif
 
 #ifdef CONFIG_NET_PKT
-void uip_pktsend(FAR struct uip_driver_s *dev, FAR const void *buf,
+void uip_pktsend(FAR struct net_driver_s *dev, FAR const void *buf,
                  unsigned int len);
 #endif
 
diff --git a/nuttx/net/uip/uip_callback.c b/nuttx/net/uip/uip_callback.c
index e036dc562..585ac0cef 100644
--- a/nuttx/net/uip/uip_callback.c
+++ b/nuttx/net/uip/uip_callback.c
@@ -220,7 +220,7 @@ void uip_callbackfree(FAR struct uip_callback_s *cb,
  *
  ****************************************************************************/
 
-uint16_t uip_callbackexecute(FAR struct uip_driver_s *dev, void *pvconn,
+uint16_t uip_callbackexecute(FAR struct net_driver_s *dev, void *pvconn,
                              uint16_t flags, FAR struct uip_callback_s *list)
 {
   FAR struct uip_callback_s *next;
diff --git a/nuttx/net/uip/uip_input.c b/nuttx/net/uip/uip_input.c
index 557023202..eaddac9bf 100644
--- a/nuttx/net/uip/uip_input.c
+++ b/nuttx/net/uip/uip_input.c
@@ -307,7 +307,7 @@ nullreturn:
  *
  ****************************************************************************/
 
-int uip_input(struct uip_driver_s *dev)
+int uip_input(struct net_driver_s *dev)
 {
   struct uip_ip_hdr *pbuf = BUF;
   uint16_t iplen;
diff --git a/nuttx/net/uip/uip_iobsend.c b/nuttx/net/uip/uip_iobsend.c
index 874e78e7f..ed18cf583 100644
--- a/nuttx/net/uip/uip_iobsend.c
+++ b/nuttx/net/uip/uip_iobsend.c
@@ -97,7 +97,7 @@
  *
  ****************************************************************************/
 
-void uip_iobsend(FAR struct uip_driver_s *dev, FAR struct iob_s *iob,
+void uip_iobsend(FAR struct net_driver_s *dev, FAR struct iob_s *iob,
                  unsigned int len, unsigned int offset)
 {
   DEBUGASSERT(dev && len > 0 && len < CONFIG_NET_BUFSIZE);
diff --git a/nuttx/net/uip/uip_pktsend.c b/nuttx/net/uip/uip_pktsend.c
index 379845922..1e5524481 100644
--- a/nuttx/net/uip/uip_pktsend.c
+++ b/nuttx/net/uip/uip_pktsend.c
@@ -97,7 +97,7 @@
  *
  ****************************************************************************/
 
-void uip_pktsend(FAR struct uip_driver_s *dev, FAR const void *buf,
+void uip_pktsend(FAR struct net_driver_s *dev, FAR const void *buf,
                  unsigned int len)
 {
   DEBUGASSERT(dev && len > 0 && len < CONFIG_NET_BUFSIZE);
diff --git a/nuttx/net/uip/uip_poll.c b/nuttx/net/uip/uip_poll.c
index f7c212f99..fef5c0ace 100644
--- a/nuttx/net/uip/uip_poll.c
+++ b/nuttx/net/uip/uip_poll.c
@@ -74,7 +74,7 @@
  ****************************************************************************/
 
 #if defined(CONFIG_NET_PKT)
-static int uip_pollpktconnections(struct uip_driver_s *dev,
+static int uip_pollpktconnections(struct net_driver_s *dev,
                                   uip_poll_callback_t callback)
 {
   FAR struct pkt_conn_s *pkt_conn = NULL;
@@ -110,7 +110,7 @@ static int uip_pollpktconnections(struct uip_driver_s *dev,
  ****************************************************************************/
 
 #if defined(CONFIG_NET_ICMP) && defined(CONFIG_NET_ICMP_PING)
-static inline int uip_pollicmp(FAR struct uip_driver_s *dev,
+static inline int uip_pollicmp(FAR struct net_driver_s *dev,
                                uip_poll_callback_t callback)
 {
   /* Perform the UDP TX poll */
@@ -136,7 +136,7 @@ static inline int uip_pollicmp(FAR struct uip_driver_s *dev,
  ****************************************************************************/
 
 #ifdef CONFIG_NET_IGMP
-static inline int uip_polligmp(FAR struct uip_driver_s *dev,
+static inline int uip_polligmp(FAR struct net_driver_s *dev,
                                uip_poll_callback_t callback)
 {
   /* Perform the IGMP TX poll */
@@ -162,7 +162,7 @@ static inline int uip_polligmp(FAR struct uip_driver_s *dev,
  ****************************************************************************/
 
 #ifdef CONFIG_NET_UDP
-static int uip_polludpconnections(FAR struct uip_driver_s *dev,
+static int uip_polludpconnections(FAR struct net_driver_s *dev,
                                   uip_poll_callback_t callback)
 {
   FAR struct udp_conn_s *conn = NULL;
@@ -198,7 +198,7 @@ static int uip_polludpconnections(FAR struct uip_driver_s *dev,
  ****************************************************************************/
 
 #ifdef CONFIG_NET_TCP
-static inline int uip_polltcpconnections(FAR struct uip_driver_s *dev,
+static inline int uip_polltcpconnections(FAR struct net_driver_s *dev,
                                          uip_poll_callback_t callback)
 {
   FAR struct tcp_conn_s *conn  = NULL;
@@ -237,7 +237,7 @@ static inline int uip_polltcpconnections(FAR struct uip_driver_s *dev,
  ****************************************************************************/
 
 #ifdef CONFIG_NET_TCP
-static inline int uip_polltcptimer(FAR struct uip_driver_s *dev,
+static inline int uip_polltcptimer(FAR struct net_driver_s *dev,
                                    uip_poll_callback_t callback, int hsec)
 {
   FAR struct tcp_conn_s *conn  = NULL;
@@ -291,7 +291,7 @@ static inline int uip_polltcptimer(FAR struct uip_driver_s *dev,
  *
  ****************************************************************************/
 
-int uip_poll(FAR struct uip_driver_s *dev, uip_poll_callback_t callback)
+int uip_poll(FAR struct net_driver_s *dev, uip_poll_callback_t callback)
 {
   int bstop;
 
@@ -366,7 +366,7 @@ int uip_poll(FAR struct uip_driver_s *dev, uip_poll_callback_t callback)
  *
  ****************************************************************************/
 
-int uip_timer(FAR struct uip_driver_s *dev, uip_poll_callback_t callback,
+int uip_timer(FAR struct net_driver_s *dev, uip_poll_callback_t callback,
               int hsec)
 {
   int bstop;
diff --git a/nuttx/net/uip/uip_send.c b/nuttx/net/uip/uip_send.c
index f426166b8..515ce8e9c 100644
--- a/nuttx/net/uip/uip_send.c
+++ b/nuttx/net/uip/uip_send.c
@@ -93,7 +93,7 @@
  *
  ****************************************************************************/
 
-void uip_send(struct uip_driver_s *dev, const void *buf, int len)
+void uip_send(struct net_driver_s *dev, const void *buf, int len)
 {
   DEBUGASSERT(dev && len > 0 && len < CONFIG_NET_BUFSIZE);
 
diff --git a/nuttx/net/utils/net_chksum.c b/nuttx/net/utils/net_chksum.c
index a48e74935..c6e93873f 100644
--- a/nuttx/net/utils/net_chksum.c
+++ b/nuttx/net/utils/net_chksum.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * net/utils/net_chksum.c
  *
- *   Copyright (C) 2007-2010, 2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2010, 2012, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -104,7 +104,7 @@ static uint16_t chksum(uint16_t sum, FAR const uint8_t *data, uint16_t len)
   return sum;
 }
 
-static uint16_t upper_layer_chksum(FAR struct uip_driver_s *dev, uint8_t proto)
+static uint16_t upper_layer_chksum(FAR struct net_driver_s *dev, uint8_t proto)
 {
   struct uip_ip_hdr *pbuf = BUF;
   uint16_t upper_layer_len;
@@ -134,7 +134,7 @@ static uint16_t upper_layer_chksum(FAR struct uip_driver_s *dev, uint8_t proto)
 }
 
 #ifdef CONFIG_NET_IPv6
-static uint16_t icmp_6chksum(FAR struct uip_driver_s *dev)
+static uint16_t icmp_6chksum(FAR struct net_driver_s *dev)
 {
   return upper_layer_chksum(dev, UIP_PROTO_ICMP6);
 }
@@ -169,18 +169,19 @@ static inline void uip_carry32(FAR uint8_t *sum, uint16_t op16)
         }
     }
 }
+#endif /* UIP_ARCH_ADD32 */
 
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
 
+#if !UIP_ARCH_ADD32
 void uip_incr32(FAR uint8_t *op32, uint16_t op16)
 {
   op32[3] += (op16 & 0xff);
   op32[2] += (op16 >> 8);
   uip_carry32(op32, op16);
 }
-
 #endif /* UIP_ARCH_ADD32 */
 
 #if !UIP_ARCH_CHKSUM
@@ -192,7 +193,7 @@ uint16_t uip_chksum(FAR uint16_t *data, uint16_t len)
 /* Calculate the IP header checksum of the packet header in d_buf. */
 
 #ifndef UIP_ARCH_IPCHKSUM
-uint16_t uip_ipchksum(FAR struct uip_driver_s *dev)
+uint16_t uip_ipchksum(FAR struct net_driver_s *dev)
 {
   uint16_t sum;
 
@@ -203,7 +204,7 @@ uint16_t uip_ipchksum(FAR struct uip_driver_s *dev)
 
 /* Calculate the TCP checksum of the packet in d_buf and d_appdata. */
 
-uint16_t tcp_chksum(FAR struct uip_driver_s *dev)
+uint16_t tcp_chksum(FAR struct net_driver_s *dev)
 {
   return upper_layer_chksum(dev, UIP_PROTO_TCP);
 }
@@ -211,7 +212,7 @@ uint16_t tcp_chksum(FAR struct uip_driver_s *dev)
 /* Calculate the UDP checksum of the packet in d_buf and d_appdata. */
 
 #ifdef CONFIG_NET_UDP_CHECKSUMS
-uint16_t udp_chksum(FAR struct uip_driver_s *dev)
+uint16_t udp_chksum(FAR struct net_driver_s *dev)
 {
   return upper_layer_chksum(dev, UIP_PROTO_UDP);
 }
@@ -220,7 +221,7 @@ uint16_t udp_chksum(FAR struct uip_driver_s *dev)
 /* Calculate the checksum of the ICMP message */
 
 #if defined(CONFIG_NET_ICMP) && defined(CONFIG_NET_ICMP_PING)
-uint16_t icmp_chksum(FAR struct uip_driver_s *dev, int len)
+uint16_t icmp_chksum(FAR struct net_driver_s *dev, int len)
 {
   FAR struct icmp_iphdr_s *picmp = ICMPBUF;
   return uip_chksum((uint16_t*)&picmp->type, len);