5 files changed, 12 insertions, 35 deletions
diff --git a/nuttx/net/uip/uip.h b/nuttx/net/uip/uip.h
index 413a8b752..5796ccadc 100644
--- a/nuttx/net/uip/uip.h
+++ b/nuttx/net/uip/uip.h
@@ -125,31 +125,6 @@ void uip_pktpoll(struct uip_driver_s *dev, struct uip_pkt_conn *conn);
 
 #endif /* CONFIG_NET_PKT */
 
-#ifdef CONFIG_NET_UDP
-/* Defined in udp_conn.c ****************************************************/
-
-void uip_udpinit(void);
-struct uip_udp_conn *uip_udpactive(struct uip_udpip_hdr *buf);
-struct uip_udp_conn *uip_nextudpconn(struct uip_udp_conn *conn);
-
-/* Defined in udp_poll.c ****************************************************/
-
-void uip_udppoll(struct uip_driver_s *dev, struct uip_udp_conn *conn);
-
-/* Defined in udp_send.c ****************************************************/
-
-void uip_udpsend(struct uip_driver_s *dev, struct uip_udp_conn *conn);
-
-/* Defined in udp_input.c ***************************************************/
-
-int uip_udpinput(struct uip_driver_s *dev);
-
-/* Defined in udp_callback.c ************************************************/
-
-uint16_t uip_udpcallback(struct uip_driver_s *dev,
-                         struct uip_udp_conn *conn, uint16_t flags);
-#endif /* CONFIG_NET_UDP */
-
 #ifdef CONFIG_NET_ICMP
 /* Defined in icmp_input.c **************************************************/
 
diff --git a/nuttx/net/uip/uip_chksum.c b/nuttx/net/uip/uip_chksum.c
index db6eb36d0..26b683314 100644
--- a/nuttx/net/uip/uip_chksum.c
+++ b/nuttx/net/uip/uip_chksum.c
@@ -210,7 +210,7 @@ uint16_t tcp_chksum(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 uip_udpchksum(struct uip_driver_s *dev)
+uint16_t udp_chksum(struct uip_driver_s *dev)
 {
   return upper_layer_chksum(dev, UIP_PROTO_UDP);
 }
diff --git a/nuttx/net/uip/uip_initialize.c b/nuttx/net/uip/uip_initialize.c
index 3504b8fa3..139086c4a 100644
--- a/nuttx/net/uip/uip_initialize.c
+++ b/nuttx/net/uip/uip_initialize.c
@@ -47,8 +47,9 @@
 #include <stdint.h>
 #include <nuttx/net/uip.h>
 
+#include "uip/uip.h"
 #include "tcp/tcp.h"
-#include "uip.h"
+#include "udp/udp.h"
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -149,7 +150,7 @@ void uip_initialize(void)
   /* Initialize the UDP connection structures */
 
 #ifdef CONFIG_NET_UDP
-  uip_udpinit();
+  udp_initialize();
 #endif
 
   /* Initialize IGMP support */
diff --git a/nuttx/net/uip/uip_input.c b/nuttx/net/uip/uip_input.c
index 9fa25d4e2..c772eab85 100644
--- a/nuttx/net/uip/uip_input.c
+++ b/nuttx/net/uip/uip_input.c
@@ -93,9 +93,9 @@
 # include "uip_neighbor.h"
 #endif /* CONFIG_NET_IPv6 */
 
+#include "uip/uip.h"
 #include "tcp/tcp.h"
 #include "udp/udp.h"
-#include "uip.h"
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -414,7 +414,7 @@ int uip_input(struct uip_driver_s *dev)
       uip_ipaddr_cmp(pbuf->destipaddr, g_alloneaddr))
 #endif
     {
-      return uip_udpinput(dev);
+      return udp_input(dev);
     }
 
   /* In most other cases, the device must be assigned a non-zero IP
@@ -514,7 +514,7 @@ int uip_input(struct uip_driver_s *dev)
 
 #ifdef CONFIG_NET_UDP
       case UIP_PROTO_UDP:   /* UDP input */
-        uip_udpinput(dev);
+        udp_input(dev);
         break;
 #endif
 
diff --git a/nuttx/net/uip/uip_poll.c b/nuttx/net/uip/uip_poll.c
index fad9d44f9..e8ed2dded 100644
--- a/nuttx/net/uip/uip_poll.c
+++ b/nuttx/net/uip/uip_poll.c
@@ -46,8 +46,9 @@
 #include <nuttx/net/uip.h>
 #include <nuttx/net/netdev.h>
 
+#include "uip/uip.h"
 #include "tcp/tcp.h"
-#include "uip.h"
+#include "udp/udp.h"
 
 /****************************************************************************
  * Private Data
@@ -161,16 +162,16 @@ static inline int uip_polligmp(FAR struct uip_driver_s *dev,
 static int uip_polludpconnections(FAR struct uip_driver_s *dev,
                                   uip_poll_callback_t callback)
 {
-  FAR struct uip_udp_conn *udp_conn = NULL;
+  FAR struct udp_conn_s *conn = NULL;
   int bstop = 0;
 
   /* Traverse all of the allocated UDP connections and perform the poll action */
 
-  while (!bstop && (udp_conn = uip_nextudpconn(udp_conn)))
+  while (!bstop && (conn = uip_nextudpconn(conn)))
     {
       /* Perform the UDP TX poll */
 
-      uip_udppoll(dev, udp_conn);
+      udp_poll(dev, conn);
 
       /* Call back into the driver */