NET: Rename uip_ipaddr* to net_ipaddr*

24 files changed, 89 insertions, 89 deletions

diff --git a/apps/examples/sendmail/host.c b/apps/examples/sendmail/host.c
index a175d2e9a..d603372ad 100644
--- a/apps/examples/sendmail/host.c
+++ b/apps/examples/sendmail/host.c
@@ -90,7 +90,7 @@ int main(int argc, char **argv, char **envp)
   printf("sendmail: Subject: %s\n", g_subject);
   printf("sendmail: Body: %s\n", g_msg_body);
 
-  uip_ipaddr(addr.s_addr, 127, 0, 0, 1);
+  net_ipaddr(addr.s_addr, 127, 0, 0, 1);
   handle = smtp_open();
   if (handle)
     {
diff --git a/apps/examples/sendmail/target.c b/apps/examples/sendmail/target.c
index 59a51f5d9..e9e189da7 100644
--- a/apps/examples/sendmail/target.c
+++ b/apps/examples/sendmail/target.c
@@ -144,7 +144,7 @@ int sendmail_main(int argc, char *argv[])
 
   /* Then send the mail */
 
-  uip_ipaddr(addr.s_addr, 127, 0, 0, 1);
+  net_ipaddr(addr.s_addr, 127, 0, 0, 1);
   handle = smtp_open();
   if (handle)
     {
diff --git a/apps/netutils/smtp/smtp.c b/apps/netutils/smtp/smtp.c
index 4009beb0d..4b9ddd52e 100644
--- a/apps/netutils/smtp/smtp.c
+++ b/apps/netutils/smtp/smtp.c
@@ -288,7 +288,7 @@ void smtp_configure(FAR void *handle, FAR const char *lhostname,
 {
   FAR struct smtp_state *psmtp = (FAR struct smtp_state *)handle;
   psmtp->localhostname = lhostname;
-  uip_ipaddr_copy(psmtp->smtpserver, paddr);
+  net_ipaddr_copy(psmtp->smtpserver, paddr);
 }
 
 /* Send an e-mail.
diff --git a/nuttx/include/nuttx/net/uip.h b/nuttx/include/nuttx/net/uip.h
index c2a8f9c64..bc66ea92d 100644
--- a/nuttx/include/nuttx/net/uip.h
+++ b/nuttx/include/nuttx/net/uip.h
@@ -308,7 +308,7 @@ int net_lockedwait(sem_t *sem);
  *   addr3 The forth octet of the IPv4 address.
  */
 
-#define uip_ipaddr(addr, addr0, addr1, addr2, addr3) \
+#define net_ipaddr(addr, addr0, addr1, addr2, addr3) \
   do { \
     addr = HTONL((uint32_t)(addr0) << 24 | (uint32_t)(addr1) << 16 | \
                  (uint32_t)(addr2) << 8  | (uint32_t)(addr3)); \
@@ -365,15 +365,15 @@ int net_lockedwait(sem_t *sem);
  *
  *   net_ipaddr_t ipaddr1, ipaddr2;
  *
- *   uip_ipaddr(&ipaddr1, 192,16,1,2);
- *   uip_ipaddr_copy(&ipaddr2, &ipaddr1);
+ *   net_ipaddr(&ipaddr1, 192,16,1,2);
+ *   net_ipaddr_copy(&ipaddr2, &ipaddr1);
  *
  * dest The destination for the copy.
  * src The source from where to copy.
  */
 
 #ifndef CONFIG_NET_IPv6
-#  define uip_ipaddr_copy(dest, src) \
+#  define net_ipaddr_copy(dest, src) \
    do { \
      (dest) = (in_addr_t)(src); \
    } while (0)
@@ -383,8 +383,8 @@ int net_lockedwait(sem_t *sem);
      ((uint16_t*)(dest))[1] = ((uint16_t*)(src))[1]; \
    } while (0)
 #else /* !CONFIG_NET_IPv6 */
-#  define uip_ipaddr_copy(dest, src)    memcpy(&dest, &src, sizeof(net_ip6addr_t))
-#  define uiphdr_ipaddr_copy(dest, src) uip_ipaddr_copy(dest, src)
+#  define net_ipaddr_copy(dest, src)    memcpy(&dest, &src, sizeof(net_ip6addr_t))
+#  define uiphdr_ipaddr_copy(dest, src) net_ipaddr_copy(dest, src)
 #endif /* !CONFIG_NET_IPv6 */
 
 /* Compare two IP addresses
@@ -393,8 +393,8 @@ int net_lockedwait(sem_t *sem);
  *
  *   net_ipaddr_t ipaddr1, ipaddr2;
  *
- *   uip_ipaddr(&ipaddr1, 192,16,1,2);
- *   if (uip_ipaddr_cmp(ipaddr2, ipaddr1))
+ *   net_ipaddr(&ipaddr1, 192,16,1,2);
+ *   if (net_ipaddr_cmp(ipaddr2, ipaddr1))
  *     {
  *       printf("They are the same");
  *     }
@@ -404,11 +404,11 @@ int net_lockedwait(sem_t *sem);
  */
 
 #ifndef CONFIG_NET_IPv6
-#  define uip_ipaddr_cmp(addr1, addr2)    (addr1 == addr2)
-#  define uiphdr_ipaddr_cmp(addr1, addr2) uip_ipaddr_cmp(uip_ip4addr_conv(addr1), uip_ip4addr_conv(addr2))
+#  define net_ipaddr_cmp(addr1, addr2)    (addr1 == addr2)
+#  define uiphdr_ipaddr_cmp(addr1, addr2) net_ipaddr_cmp(uip_ip4addr_conv(addr1), uip_ip4addr_conv(addr2))
 #else /* !CONFIG_NET_IPv6 */
-#  define uip_ipaddr_cmp(addr1, addr2)    (memcmp(&addr1, &addr2, sizeof(net_ip6addr_t)) == 0)
-#  define uiphdr_ipaddr_cmp(addr1, addr2) uip_ipaddr_cmp(addr, addr2)
+#  define net_ipaddr_cmp(addr1, addr2)    (memcmp(&addr1, &addr2, sizeof(net_ip6addr_t)) == 0)
+#  define uiphdr_ipaddr_cmp(addr1, addr2) net_ipaddr_cmp(addr, addr2)
 #endif /* !CONFIG_NET_IPv6 */
 
 /* Compare two IP addresses with netmasks
@@ -420,10 +420,10 @@ int net_lockedwait(sem_t *sem);
  *
  *   net_ipaddr_t ipaddr1, ipaddr2, mask;
  *
- *   uip_ipaddr(&mask, 255,255,255,0);
- *   uip_ipaddr(&ipaddr1, 192,16,1,2);
- *   uip_ipaddr(&ipaddr2, 192,16,1,3);
- *   if (uip_ipaddr_maskcmp(ipaddr1, ipaddr2, &mask))
+ *   net_ipaddr(&mask, 255,255,255,0);
+ *   net_ipaddr(&ipaddr1, 192,16,1,2);
+ *   net_ipaddr(&ipaddr2, 192,16,1,3);
+ *   if (net_ipaddr_maskcmp(ipaddr1, ipaddr2, &mask))
  *     {
  *       printf("They are the same");
  *     }
@@ -434,11 +434,11 @@ int net_lockedwait(sem_t *sem);
  */
 
 #ifndef CONFIG_NET_IPv6
-#  define uip_ipaddr_maskcmp(addr1, addr2, mask) \
+#  define net_ipaddr_maskcmp(addr1, addr2, mask) \
   (((in_addr_t)(addr1) & (in_addr_t)(mask)) == \
    ((in_addr_t)(addr2) & (in_addr_t)(mask)))
 #else
-bool uip_ipaddr_maskcmp(net_ipaddr_t addr1, net_ipaddr_t addr2,
+bool net_ipaddr_maskcmp(net_ipaddr_t addr1, net_ipaddr_t addr2,
                         net_ipaddr_t mask);
 #endif
 
@@ -451,9 +451,9 @@ bool uip_ipaddr_maskcmp(net_ipaddr_t addr1, net_ipaddr_t addr2,
  *
  *   net_ipaddr_t ipaddr1, ipaddr2, netmask;
  *
- *   uip_ipaddr(&ipaddr1, 192,16,1,2);
- *   uip_ipaddr(&netmask, 255,255,255,0);
- *   uip_ipaddr_mask(&ipaddr2, &ipaddr1, &netmask);
+ *   net_ipaddr(&ipaddr1, 192,16,1,2);
+ *   net_ipaddr(&netmask, 255,255,255,0);
+ *   net_ipaddr_mask(&ipaddr2, &ipaddr1, &netmask);
  *
  * In the example above, the variable "ipaddr2" will contain the IP
  * address 192.168.1.0.
@@ -463,7 +463,7 @@ bool uip_ipaddr_maskcmp(net_ipaddr_t addr1, net_ipaddr_t addr2,
  * mask The netmask.
  */
 
-#define uip_ipaddr_mask(dest, src, mask) \
+#define net_ipaddr_mask(dest, src, mask) \
   do { \
     (in_addr_t)(dest) = (in_addr_t)(src) & (in_addr_t)(mask); \
   } while (0)
diff --git a/nuttx/net/arp/arp_inout.c b/nuttx/net/arp/arp_inout.c
index 57e081de4..a0a8d4438 100644
--- a/nuttx/net/arp/arp_inout.c
+++ b/nuttx/net/arp/arp_inout.c
@@ -204,7 +204,7 @@ void arp_ipin(struct net_driver_s *dev)
    */
 
   srcipaddr = uip_ip4addr_conv(IPBUF->eh_srcipaddr);
-  if (uip_ipaddr_maskcmp(srcipaddr, dev->d_ipaddr, dev->d_netmask))
+  if (net_ipaddr_maskcmp(srcipaddr, dev->d_ipaddr, dev->d_netmask))
     {
       arp_update(IPBUF->eh_srcipaddr, ETHBUF->src);
     }
@@ -254,7 +254,7 @@ void arp_arpin(struct net_driver_s *dev)
 
         /* ARP request. If it asked for our address, we send out a reply. */
 
-        if (uip_ipaddr_cmp(ipaddr, dev->d_ipaddr))
+        if (net_ipaddr_cmp(ipaddr, dev->d_ipaddr))
           {
             struct eth_hdr_s *peth = ETHBUF;
 
@@ -288,7 +288,7 @@ void arp_arpin(struct net_driver_s *dev)
          * for us.
          */
 
-        if (uip_ipaddr_cmp(ipaddr, dev->d_ipaddr))
+        if (net_ipaddr_cmp(ipaddr, dev->d_ipaddr))
           {
             arp_update(parp->ah_sipaddr, parp->ah_shwaddr);
           }
@@ -384,7 +384,7 @@ void arp_out(struct net_driver_s *dev)
       /* Check if the destination address is on the local network. */
 
       destipaddr = uip_ip4addr_conv(pip->eh_destipaddr);
-      if (!uip_ipaddr_maskcmp(destipaddr, dev->d_ipaddr, dev->d_netmask))
+      if (!net_ipaddr_maskcmp(destipaddr, dev->d_ipaddr, dev->d_netmask))
         {
           /* Destination address is not on the local network */
 
@@ -401,14 +401,14 @@ void arp_out(struct net_driver_s *dev)
            * destination address when determining the MAC address.
            */
 
-          uip_ipaddr_copy(ipaddr, dev->d_draddr);
+          net_ipaddr_copy(ipaddr, dev->d_draddr);
 #endif
         }
       else
         {
           /* Else, we use the destination IP address. */
 
-          uip_ipaddr_copy(ipaddr, destipaddr);
+          net_ipaddr_copy(ipaddr, destipaddr);
         }
 
       /* Check if we already have this destination address in the ARP table */
diff --git a/nuttx/net/arp/arp_table.c b/nuttx/net/arp/arp_table.c
index f72458013..d0ce37e18 100644
--- a/nuttx/net/arp/arp_table.c
+++ b/nuttx/net/arp/arp_table.c
@@ -168,7 +168,7 @@ void arp_update(uint16_t *pipaddr, uint8_t *ethaddr)
            * the IP address in this ARP table entry.
            */
 
-          if (uip_ipaddr_cmp(ipaddr, tabptr->at_ipaddr))
+          if (net_ipaddr_cmp(ipaddr, tabptr->at_ipaddr))
             {
               /* An old entry found, update this and return. */
 
@@ -247,7 +247,7 @@ struct arp_entry *arp_find(in_addr_t ipaddr)
   for (i = 0; i < CONFIG_NET_ARPTAB_SIZE; ++i)
     {
       tabptr = &g_arptable[i];
-      if (uip_ipaddr_cmp(ipaddr, tabptr->at_ipaddr))
+      if (net_ipaddr_cmp(ipaddr, tabptr->at_ipaddr))
         {
           return tabptr;
         }
diff --git a/nuttx/net/devif/devif_input.c b/nuttx/net/devif/devif_input.c
index b167eecb7..ec14b1ae3 100644
--- a/nuttx/net/devif/devif_input.c
+++ b/nuttx/net/devif/devif_input.c
@@ -413,9 +413,9 @@ int uip_input(FAR struct net_driver_s *dev)
 #if defined(CONFIG_NET_BROADCAST) && defined(CONFIG_NET_UDP)
   if (pbuf->proto == UIP_PROTO_UDP &&
 #ifndef CONFIG_NET_IPv6
-      uip_ipaddr_cmp(uip_ip4addr_conv(pbuf->destipaddr), g_alloneaddr))
+      net_ipaddr_cmp(uip_ip4addr_conv(pbuf->destipaddr), g_alloneaddr))
 #else
-      uip_ipaddr_cmp(pbuf->destipaddr, g_alloneaddr))
+      net_ipaddr_cmp(pbuf->destipaddr, g_alloneaddr))
 #endif
     {
       return udp_input(dev);
@@ -429,7 +429,7 @@ int uip_input(FAR struct net_driver_s *dev)
   else
 #endif
 #ifdef CONFIG_NET_ICMP
-  if (uip_ipaddr_cmp(dev->d_ipaddr, g_allzeroaddr))
+  if (net_ipaddr_cmp(dev->d_ipaddr, g_allzeroaddr))
     {
       /* If we are configured to use ping IP address configuration and
        * hasn't been assigned an IP address yet, we accept all ICMP
@@ -457,7 +457,7 @@ int uip_input(FAR struct net_driver_s *dev)
     {
       /* Check if the packet is destined for our IP address. */
 #ifndef CONFIG_NET_IPv6
-      if (!uip_ipaddr_cmp(uip_ip4addr_conv(pbuf->destipaddr), dev->d_ipaddr))
+      if (!net_ipaddr_cmp(uip_ip4addr_conv(pbuf->destipaddr), dev->d_ipaddr))
         {
 #ifdef CONFIG_NET_IGMP
           net_ipaddr_t destip = uip_ip4addr_conv(pbuf->destipaddr);
@@ -479,7 +479,7 @@ int uip_input(FAR struct net_driver_s *dev)
        * multicast packets that are sent to the ff02::/16 addresses.
        */
 
-      if (!uip_ipaddr_cmp(pbuf->destipaddr, dev->d_ipaddr) &&
+      if (!net_ipaddr_cmp(pbuf->destipaddr, dev->d_ipaddr) &&
           pbuf->destipaddr[0] != 0xff02)
         {
 #ifdef CONFIG_NET_STATISTICS
diff --git a/nuttx/net/icmp/icmp_input.c b/nuttx/net/icmp/icmp_input.c
index c52da2c95..ef02b3ad7 100644
--- a/nuttx/net/icmp/icmp_input.c
+++ b/nuttx/net/icmp/icmp_input.c
@@ -214,7 +214,7 @@ typeerr:
 
   if (picmp->type == ICMP6_NEIGHBOR_SOLICITATION)
     {
-      if (uip_ipaddr_cmp(picmp->icmp6data, dev->d_ipaddr))
+      if (net_ipaddr_cmp(picmp->icmp6data, dev->d_ipaddr))
         {
           if (picmp->options[0] == ICMP6_OPTION_SOURCE_LINK_ADDRESS)
             {
diff --git a/nuttx/net/icmp/icmp_ping.c b/nuttx/net/icmp/icmp_ping.c
index 5b05aefdb..251041084 100644
--- a/nuttx/net/icmp/icmp_ping.c
+++ b/nuttx/net/icmp/icmp_ping.c
@@ -250,7 +250,7 @@ static uint16_t ping_interrupt(FAR struct net_driver_s *dev, FAR void *conn,
            * device.
            */
 
-          if (!uip_ipaddr_maskcmp(pstate->png_addr, dev->d_ipaddr, dev->d_netmask))
+          if (!net_ipaddr_maskcmp(pstate->png_addr, dev->d_ipaddr, dev->d_netmask))
             {
               /* Destination address was not on the local network served by this
                * device.  If a timeout occurs, then the most likely reason is
diff --git a/nuttx/net/icmp/icmp_send.c b/nuttx/net/icmp/icmp_send.c
index 9cbeb4ef6..a004a96cd 100644
--- a/nuttx/net/icmp/icmp_send.c
+++ b/nuttx/net/icmp/icmp_send.c
@@ -122,8 +122,8 @@ void icmp_send(FAR struct net_driver_s *dev, FAR net_ipaddr_t *destaddr)
       picmp->nexthdr     = UIP_PROTO_ICMP;
       picmp->hoplimit    = UIP_TTL;
 
-      uip_ipaddr_copy(picmp->srcipaddr, &dev->d_ipaddr);
-      uip_ipaddr_copy(picmp->destipaddr, destaddr);
+      net_ipaddr_copy(picmp->srcipaddr, &dev->d_ipaddr);
+      net_ipaddr_copy(picmp->destipaddr, destaddr);
 
 #else /* CONFIG_NET_IPv6 */
 
diff --git a/nuttx/net/igmp/igmp_group.c b/nuttx/net/igmp/igmp_group.c
index 3c76339ad..a12af82a3 100644
--- a/nuttx/net/igmp/igmp_group.c
+++ b/nuttx/net/igmp/igmp_group.c
@@ -250,7 +250,7 @@ FAR struct igmp_group_s *igmp_grpalloc(FAR struct net_driver_s *dev,
     {
       /* Initialize the non-zero elements of the group structure */
 
-      uip_ipaddr_copy(group->grpaddr, *addr);
+      net_ipaddr_copy(group->grpaddr, *addr);
       sem_init(&group->sem, 0, 0);
 
       /* Initialize the group timer (but don't start it yet) */
@@ -300,7 +300,7 @@ FAR struct igmp_group_s *igmp_grpfind(FAR struct net_driver_s *dev,
        group = group->next)
     {
       grplldbg("Compare: %08x vs. %08x\n", group->grpaddr, *addr);
-      if (uip_ipaddr_cmp(group->grpaddr, *addr))
+      if (net_ipaddr_cmp(group->grpaddr, *addr))
         {
           grplldbg("Match!\n");
           break;
diff --git a/nuttx/net/igmp/igmp_initialize.c b/nuttx/net/igmp/igmp_initialize.c
index 1ad5e9009..e9a280f58 100644
--- a/nuttx/net/igmp/igmp_initialize.c
+++ b/nuttx/net/igmp/igmp_initialize.c
@@ -86,8 +86,8 @@ void igmp_initialize(void)
 {
   nvdbg("IGMP initializing\n");
 
-  uip_ipaddr(g_allrouters, 224, 0, 0, 2);
-  uip_ipaddr(g_allsystems, 224, 0, 0, 1);
+  net_ipaddr(g_allrouters, 224, 0, 0, 2);
+  net_ipaddr(g_allsystems, 224, 0, 0, 1);
 
   /* Initialize the group allocation logic */
 
diff --git a/nuttx/net/igmp/igmp_input.c b/nuttx/net/igmp/igmp_input.c
index daae46f14..8ec707c56 100644
--- a/nuttx/net/igmp/igmp_input.c
+++ b/nuttx/net/igmp/igmp_input.c
@@ -164,7 +164,7 @@ void igmp_input(struct net_driver_s *dev)
 
         /* Check if the query was sent to all systems */
 
-        if (uip_ipaddr_cmp(destipaddr, g_allsystems))
+        if (net_ipaddr_cmp(destipaddr, g_allsystems))
           {
             /* Yes... Now check the if this this is a general or a group
              * specific query.
@@ -205,7 +205,7 @@ void igmp_input(struct net_driver_s *dev)
                   {
                     /* Skip over the all systems group entry */
 
-                    if (!uip_ipaddr_cmp(member->grpaddr, g_allsystems))
+                    if (!net_ipaddr_cmp(member->grpaddr, g_allsystems))
                       {
                         ticks = igmp_decisec2tick((int)IGMPBUF->maxresp);
                         if (IS_IDLEMEMBER(member->flags) ||
diff --git a/nuttx/net/ipv6/net_neighbor.c b/nuttx/net/ipv6/net_neighbor.c
index 1baae9e21..c85f24212 100644
--- a/nuttx/net/ipv6/net_neighbor.c
+++ b/nuttx/net/ipv6/net_neighbor.c
@@ -84,7 +84,7 @@ static struct neighbor_entry *find_entry(net_ipaddr_t ipaddr)
 
   for (i = 0; i < ENTRIES; ++i)
     {
-      if (uip_ipaddr_cmp(entries[i].ipaddr, ipaddr))
+      if (net_ipaddr_cmp(entries[i].ipaddr, ipaddr))
         {
           return &entries[i];
         }
@@ -143,7 +143,7 @@ void net_neighbor_add(net_ipaddr_t ipaddr, struct net_neighbor_addr_s *addr)
           oldest = i;
           break;
         }
-      if (uip_ipaddr_cmp(entries[i].ipaddr, addr))
+      if (net_ipaddr_cmp(entries[i].ipaddr, addr))
         {
           oldest = i;
           break;
@@ -160,7 +160,7 @@ void net_neighbor_add(net_ipaddr_t ipaddr, struct net_neighbor_addr_s *addr)
    */
 
   entries[oldest].time = 0;
-  uip_ipaddr_copy(entries[oldest].ipaddr, ipaddr);
+  net_ipaddr_copy(entries[oldest].ipaddr, ipaddr);
   memcpy(&entries[oldest].addr, addr, sizeof(struct net_neighbor_addr_s));
 }
 
diff --git a/nuttx/net/netdev/netdev_findbyaddr.c b/nuttx/net/netdev/netdev_findbyaddr.c
index 5330d919e..9aa868b81 100644
--- a/nuttx/net/netdev/netdev_findbyaddr.c
+++ b/nuttx/net/netdev/netdev_findbyaddr.c
@@ -108,7 +108,7 @@ static FAR struct net_driver_s *netdev_finddevice(const net_ipaddr_t addr)
         {
           /* Yes.. check for an address match (under the netmask) */
 
-          if (uip_ipaddr_maskcmp(dev->d_ipaddr, addr, dev->d_netmask))
+          if (net_ipaddr_maskcmp(dev->d_ipaddr, addr, dev->d_netmask))
             {
               /* Its a match */
 
diff --git a/nuttx/net/route/net_addroute.c b/nuttx/net/route/net_addroute.c
index 5bdd380fd..acadcbb43 100644
--- a/nuttx/net/route/net_addroute.c
+++ b/nuttx/net/route/net_addroute.c
@@ -92,9 +92,9 @@ int net_addroute(net_ipaddr_t target, net_ipaddr_t netmask,
 
   /* Format the new route table entry */
 
-  uip_ipaddr_copy(route->target, target);
-  uip_ipaddr_copy(route->netmask, netmask);
-  uip_ipaddr_copy(route->router, router);
+  net_ipaddr_copy(route->target, target);
+  net_ipaddr_copy(route->netmask, netmask);
+  net_ipaddr_copy(route->router, router);
 
   /* Get exclusive address to the networking data structures */
 
diff --git a/nuttx/net/route/net_delroute.c b/nuttx/net/route/net_delroute.c
index 29dfbab16..f8b714984 100644
--- a/nuttx/net/route/net_delroute.c
+++ b/nuttx/net/route/net_delroute.c
@@ -85,8 +85,8 @@ static int net_match(FAR struct net_route_s *route, FAR void *arg)
    * must be the same.
    */
 
-  if (uip_ipaddr_maskcmp(route->target, match->target, match->netmask) &&
-      uip_ipaddr_cmp(route->netmask, match->netmask))
+  if (net_ipaddr_maskcmp(route->target, match->target, match->netmask) &&
+      net_ipaddr_cmp(route->netmask, match->netmask))
     {
       /* They match.. Remove the entry from the routing table */
 
@@ -139,8 +139,8 @@ int net_delroute(net_ipaddr_t target, net_ipaddr_t netmask)
   /* Set up the comparison structure */
 
   match.prev = NULL;
-  uip_ipaddr_copy(match.target, target);
-  uip_ipaddr_copy(match.netmask, netmask);
+  net_ipaddr_copy(match.target, target);
+  net_ipaddr_copy(match.netmask, netmask);
 
   /* Then remove the entry from the routing table */
 
diff --git a/nuttx/net/route/net_router.c b/nuttx/net/route/net_router.c
index 3ebf625b6..6dab94664 100644
--- a/nuttx/net/route/net_router.c
+++ b/nuttx/net/route/net_router.c
@@ -85,11 +85,11 @@ static int net_match(FAR struct net_route_s *route, FAR void *arg)
    * concept for the precedence of networks.
    */
 
-  if (uip_ipaddr_maskcmp(route->target, match->target, route->netmask))
+  if (net_ipaddr_maskcmp(route->target, match->target, route->netmask))
     {
       /* They match.. Copy the router address */
 
-      uip_ipaddr_copy(match->router, route->router);
+      net_ipaddr_copy(match->router, route->router);
       return 1;
     }
 
@@ -132,7 +132,7 @@ int net_router(net_ipaddr_t target, FAR net_ipaddr_t *router)
   /* Set up the comparison structure */
 
   memset(&match, 0, sizeof(struct route_match_s));
-  uip_ipaddr_copy(match.target, target);
+  net_ipaddr_copy(match.target, target);
 
   /* Find an router entry with the routing table that can forward to this
    * address
@@ -144,9 +144,9 @@ int net_router(net_ipaddr_t target, FAR net_ipaddr_t *router)
       /* We found a route.  Return the router address. */
 
 #ifdef CONFIG_NET_IPv6
-      uip_ipaddr_copy(router, match.target);
+      net_ipaddr_copy(router, match.target);
 #else
-      uip_ipaddr_copy(*router, match.target);
+      net_ipaddr_copy(*router, match.target);
 #endif
       ret = OK;
     }
diff --git a/nuttx/net/route/netdev_router.c b/nuttx/net/route/netdev_router.c
index 819203621..3adaa3bdb 100644
--- a/nuttx/net/route/netdev_router.c
+++ b/nuttx/net/route/netdev_router.c
@@ -92,12 +92,12 @@ static int net_devmatch(FAR struct net_route_s *route, FAR void *arg)
    * not (yet) any concept for the precedence of networks.
    */
 
-  if (uip_ipaddr_maskcmp(route->target, match->target, route->netmask) &&
-      uip_ipaddr_maskcmp(route->router, dev->d_ipaddr, dev->d_netmask))
+  if (net_ipaddr_maskcmp(route->target, match->target, route->netmask) &&
+      net_ipaddr_maskcmp(route->router, dev->d_ipaddr, dev->d_netmask))
     {
       /* They match.. Copy the router address */
 
-      uip_ipaddr_copy(match->router, route->router);
+      net_ipaddr_copy(match->router, route->router);
       return 1;
     }
 
@@ -146,7 +146,7 @@ void netdev_router(FAR struct net_driver_s *dev, net_ipaddr_t target,
 
   memset(&match, 0, sizeof(struct route_devmatch_s));
   match.dev = dev;
-  uip_ipaddr_copy(match.target, target);
+  net_ipaddr_copy(match.target, target);
 
   /* Find an router entry with the routing table that can forward to this
    * address using this device.
@@ -158,9 +158,9 @@ void netdev_router(FAR struct net_driver_s *dev, net_ipaddr_t target,
       /* We found a route.  Return the router address. */
 
 #ifdef CONFIG_NET_IPv6
-      uip_ipaddr_copy(router, match.target);
+      net_ipaddr_copy(router, match.target);
 #else
-      uip_ipaddr_copy(*router, match.target);
+      net_ipaddr_copy(*router, match.target);
 #endif
       ret = OK;
     }
@@ -171,9 +171,9 @@ void netdev_router(FAR struct net_driver_s *dev, net_ipaddr_t target,
        */
 
 #ifdef CONFIG_NET_IPv6
-      uip_ipaddr_copy(router, dev->d_draddr);
+      net_ipaddr_copy(router, dev->d_draddr);
 #else
-      uip_ipaddr_copy(*router, dev->d_draddr);
+      net_ipaddr_copy(*router, dev->d_draddr);
 #endif
     }
 }
diff --git a/nuttx/net/socket/accept.c b/nuttx/net/socket/accept.c
index 1908c9293..ba86f0f95 100644
--- a/nuttx/net/socket/accept.c
+++ b/nuttx/net/socket/accept.c
@@ -110,7 +110,7 @@ static inline void accept_tcpsender(FAR struct tcp_conn_s *conn,
     {
       addr->sin_family = AF_INET6;
       addr->sin_port   = conn->rport;
-      uip_ipaddr_copy(addr->sin6_addr.s6_addr, conn->ripaddr);
+      net_ipaddr_copy(addr->sin6_addr.s6_addr, conn->ripaddr);
     }
 }
 #else
@@ -121,7 +121,7 @@ static inline void accept_tcpsender(FAR struct tcp_conn_s *conn,
     {
       addr->sin_family = AF_INET;
       addr->sin_port   = conn->rport;
-      uip_ipaddr_copy(addr->sin_addr.s_addr, conn->ripaddr);
+      net_ipaddr_copy(addr->sin_addr.s_addr, conn->ripaddr);
     }
 }
 #endif /* CONFIG_NET_IPv6 */
diff --git a/nuttx/net/socket/recvfrom.c b/nuttx/net/socket/recvfrom.c
index 75b44d3ad..1ac582004 100644
--- a/nuttx/net/socket/recvfrom.c
+++ b/nuttx/net/socket/recvfrom.c
@@ -575,9 +575,9 @@ static inline void recvfrom_tcpsender(FAR struct net_driver_s *dev,
       infrom->sin_port   = TCPBUF->srcport;
 
 #ifdef CONFIG_NET_IPv6
-      uip_ipaddr_copy(infrom->sin6_addr.s6_addr, TCPBUF->srcipaddr);
+      net_ipaddr_copy(infrom->sin6_addr.s6_addr, TCPBUF->srcipaddr);
 #else
-      uip_ipaddr_copy(infrom->sin_addr.s_addr, uip_ip4addr_conv(TCPBUF->srcipaddr));
+      net_ipaddr_copy(infrom->sin_addr.s_addr, uip_ip4addr_conv(TCPBUF->srcipaddr));
 #endif
     }
 }
@@ -821,9 +821,9 @@ static inline void recvfrom_udpsender(struct net_driver_s *dev, struct recvfrom_
       infrom->sin_port   = UDPBUF->srcport;
 
 #ifdef CONFIG_NET_IPv6
-      uip_ipaddr_copy(infrom->sin6_addr.s6_addr, UDPBUF->srcipaddr);
+      net_ipaddr_copy(infrom->sin6_addr.s6_addr, UDPBUF->srcipaddr);
 #else
-      uip_ipaddr_copy(infrom->sin_addr.s_addr, uip_ip4addr_conv(UDPBUF->srcipaddr));
+      net_ipaddr_copy(infrom->sin_addr.s_addr, uip_ip4addr_conv(UDPBUF->srcipaddr));
 #endif
     }
 }
diff --git a/nuttx/net/tcp/tcp_conn.c b/nuttx/net/tcp/tcp_conn.c
index 235af87d5..28c0cfc1a 100644
--- a/nuttx/net/tcp/tcp_conn.c
+++ b/nuttx/net/tcp/tcp_conn.c
@@ -420,7 +420,7 @@ FAR struct tcp_conn_s *tcp_active(struct tcp_iphdr_s *buf)
 
       if (conn->tcpstateflags != UIP_CLOSED &&
           buf->destport == conn->lport && buf->srcport == conn->rport &&
-          uip_ipaddr_cmp(srcipaddr, conn->ripaddr))
+          net_ipaddr_cmp(srcipaddr, conn->ripaddr))
         {
           /* Matching connection found.. break out of the loop and return a
            * reference to it.
@@ -522,7 +522,7 @@ FAR struct tcp_conn_s *tcp_alloc_accept(FAR struct tcp_iphdr_s *buf)
       conn->lport         = buf->destport;
       conn->rport         = buf->srcport;
       conn->mss           = UIP_TCP_INITIAL_MSS;
-      uip_ipaddr_copy(conn->ripaddr, uip_ip4addr_conv(buf->srcipaddr));
+      net_ipaddr_copy(conn->ripaddr, uip_ip4addr_conv(buf->srcipaddr));
       conn->tcpstateflags = UIP_SYN_RCVD;
 
       tcp_initsequence(conn->sndseq);
@@ -606,9 +606,9 @@ int tcp_bind(FAR struct tcp_conn_s *conn,
 
 #if 0 /* Not used */
 #ifdef CONFIG_NET_IPv6
-  uip_ipaddr_copy(conn->lipaddr, addr->sin6_addr.in6_u.u6_addr16);
+  net_ipaddr_copy(conn->lipaddr, addr->sin6_addr.in6_u.u6_addr16);
 #else
-  uip_ipaddr_copy(conn->lipaddr, addr->sin_addr.s_addr);
+  net_ipaddr_copy(conn->lipaddr, addr->sin_addr.s_addr);
 #endif
 #endif
 
@@ -694,7 +694,7 @@ int tcp_connect(FAR struct tcp_conn_s *conn,
 
   /* The sockaddr address is 32-bits in network order. */
 
-  uip_ipaddr_copy(conn->ripaddr, addr->sin_addr.s_addr);
+  net_ipaddr_copy(conn->ripaddr, addr->sin_addr.s_addr);
 
 #ifdef CONFIG_NET_TCP_READAHEAD
   /* Initialize the list of TCP read-ahead buffers */
diff --git a/nuttx/net/udp/udp_conn.c b/nuttx/net/udp/udp_conn.c
index 4640bdb77..1e4b2ff4f 100644
--- a/nuttx/net/udp/udp_conn.c
+++ b/nuttx/net/udp/udp_conn.c
@@ -319,8 +319,8 @@ FAR struct udp_conn_s *udp_active(FAR struct udp_iphdr_s *buf)
 
       if (conn->lport != 0 && buf->destport == conn->lport &&
           (conn->rport == 0 || buf->srcport == conn->rport) &&
-            (uip_ipaddr_cmp(conn->ripaddr, g_allzeroaddr) ||
-             uip_ipaddr_cmp(conn->ripaddr, g_alloneaddr) ||
+            (net_ipaddr_cmp(conn->ripaddr, g_allzeroaddr) ||
+             net_ipaddr_cmp(conn->ripaddr, g_alloneaddr) ||
              uiphdr_ipaddr_cmp(buf->srcipaddr, &conn->ripaddr)))
         {
           /* Matching connection found.. return a reference to it */
@@ -456,12 +456,12 @@ int udp_connect(FAR struct udp_conn_s *conn,
   if (addr)
     {
       conn->rport = addr->sin_port;
-      uip_ipaddr_copy(conn->ripaddr, addr->sin_addr.s_addr);
+      net_ipaddr_copy(conn->ripaddr, addr->sin_addr.s_addr);
     }
   else
     {
       conn->rport = 0;
-      uip_ipaddr_copy(conn->ripaddr, g_allzeroaddr);
+      net_ipaddr_copy(conn->ripaddr, g_allzeroaddr);
     }
 
   conn->ttl = UIP_TTL;
diff --git a/nuttx/net/udp/udp_send.c b/nuttx/net/udp/udp_send.c
index e41f00b4c..e9ca6b0c0 100644
--- a/nuttx/net/udp/udp_send.c
+++ b/nuttx/net/udp/udp_send.c
@@ -122,8 +122,8 @@ void udp_send(struct net_driver_s *dev, struct udp_conn_s *conn)
       pudpbuf->nexthdr     = UIP_PROTO_UDP;
       pudpbuf->hoplimit    = conn->ttl;
 
-      uip_ipaddr_copy(pudpbuf->srcipaddr, &dev->d_ipaddr);
-      uip_ipaddr_copy(pudpbuf->destipaddr, &conn->ripaddr);
+      net_ipaddr_copy(pudpbuf->srcipaddr, &dev->d_ipaddr);
+      net_ipaddr_copy(pudpbuf->destipaddr, &conn->ripaddr);
 
 #else /* CONFIG_NET_IPv6 */