Rename many functions in net/devif from uip_* to devif_*

4 files changed, 10 insertions, 5 deletions

diff --git a/nuttx/net/pkt/pkt.h b/nuttx/net/pkt/pkt.h
index 900f631c2..5010d7275 100644
--- a/nuttx/net/pkt/pkt.h
+++ b/nuttx/net/pkt/pkt.h
@@ -50,6 +50,11 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
+/* Allocate a new packet socket data callback */
+
+#define pkt_callback_alloc(conn)   devif_callback_alloc(&conn->list)
+#define pkt_callback_free(conn,cb) devif_callback_free(cb, &conn->list)
+
 /****************************************************************************
  * Public Type Definitions
  ****************************************************************************/
diff --git a/nuttx/net/pkt/pkt_callback.c b/nuttx/net/pkt/pkt_callback.c
index 9c90225ee..0412bdcb9 100644
--- a/nuttx/net/pkt/pkt_callback.c
+++ b/nuttx/net/pkt/pkt_callback.c
@@ -88,7 +88,7 @@ uint16_t pkt_callback(FAR struct net_driver_s *dev,
     {
       /* Perform the callback */
 
-      flags = uip_callbackexecute(dev, conn, flags, conn->list);
+      flags = devif_callback_execute(dev, conn, flags, conn->list);
     }
 
   return flags;
diff --git a/nuttx/net/pkt/pkt_poll.c b/nuttx/net/pkt/pkt_poll.c
index 7ab0803ca..33b3bfb41 100644
--- a/nuttx/net/pkt/pkt_poll.c
+++ b/nuttx/net/pkt/pkt_poll.c
@@ -118,7 +118,7 @@ void pkt_poll(FAR struct net_driver_s *dev, FAR struct pkt_conn_s *conn)
 
       if (dev->d_sndlen > 0)
         {
-//        uip_pktsend(dev, conn);
+//        devif_pkt_send(dev, conn);
           return;
         }
     }
diff --git a/nuttx/net/pkt/pkt_send.c b/nuttx/net/pkt/pkt_send.c
index 39924fd88..dc71ee6b4 100644
--- a/nuttx/net/pkt/pkt_send.c
+++ b/nuttx/net/pkt/pkt_send.c
@@ -124,7 +124,7 @@ static uint16_t psock_send_interrupt(FAR struct net_driver_s *dev,
         {
           /* Copy the packet data into the device packet buffer and send it */
 
-          uip_pktsend(dev, pstate->snd_buffer, pstate->snd_buflen);
+          devif_pkt_send(dev, pstate->snd_buffer, pstate->snd_buflen);
           pstate->snd_sent = pstate->snd_buflen;
         }
 
@@ -243,7 +243,7 @@ ssize_t psock_pkt_send(FAR struct socket *psock, FAR const void *buf,
 
       /* Allocate resource to receive a callback */
 
-      state.snd_cb = pkt_callbackalloc(conn);
+      state.snd_cb = pkt_callback_alloc(conn);
       if (state.snd_cb)
         {
           FAR struct net_driver_s *dev;
@@ -281,7 +281,7 @@ ssize_t psock_pkt_send(FAR struct socket *psock, FAR const void *buf,
 
           /* Make sure that no further interrupts are processed */
 
-          pkt_callbackfree(conn, state.snd_cb);
+          pkt_callback_free(conn, state.snd_cb);
 
           /* Clear the no-ARP bit in the device flags */