NET: Rename uip_callback_s to devif_callback_s

6 files changed, 41 insertions, 41 deletions

diff --git a/nuttx/net/socket/connect.c b/nuttx/net/socket/connect.c
index bc42ac398..e93838f93 100644
--- a/nuttx/net/socket/connect.c
+++ b/nuttx/net/socket/connect.c
@@ -64,10 +64,10 @@
 #ifdef CONFIG_NET_TCP
 struct tcp_connect_s
 {
-  FAR struct tcp_conn_s     *tc_conn;    /* Reference to TCP connection structure */
-  FAR struct uip_callback_s *tc_cb;      /* Reference to callback instance */
-  sem_t                      tc_sem;     /* Semaphore signals recv completion */
-  int                        tc_result;  /* OK on success, otherwise a negated errno. */
+  FAR struct tcp_conn_s  *tc_conn;    /* Reference to TCP connection structure */
+  FAR struct devif_callback_s *tc_cb; /* Reference to callback instance */
+  sem_t                   tc_sem;     /* Semaphore signals recv completion */
+  int                     tc_result;  /* OK on success, otherwise a negated errno. */
 };
 #endif
 
diff --git a/nuttx/net/socket/net_close.c b/nuttx/net/socket/net_close.c
index 6b92f683a..515109b46 100644
--- a/nuttx/net/socket/net_close.c
+++ b/nuttx/net/socket/net_close.c
@@ -74,13 +74,13 @@
 #ifdef CONFIG_NET_TCP
 struct tcp_close_s
 {
-  FAR struct uip_callback_s *cl_cb;     /* Reference to TCP callback instance */
+  FAR struct devif_callback_s *cl_cb; /* Reference to TCP callback instance */
 #ifdef CONFIG_NET_SOLINGER
-  FAR struct socket         *cl_psock;  /* Reference to the TCP socket */
-  sem_t                      cl_sem;    /* Signals disconnect completion */
-  int                        cl_result; /* The result of the close */
+  FAR struct socket       *cl_psock;  /* Reference to the TCP socket */
+  sem_t                    cl_sem;    /* Signals disconnect completion */
+  int                      cl_result; /* The result of the close */
 #ifndef CONFIG_DISABLE_CLOCK
-  uint32_t                   cl_start;  /* Time close started (in ticks) */
+  uint32_t                 cl_start;  /* Time close started (in ticks) */
 #endif
 #endif
 };
diff --git a/nuttx/net/socket/net_poll.c b/nuttx/net/socket/net_poll.c
index 681b6c5bc..5ce00931b 100644
--- a/nuttx/net/socket/net_poll.c
+++ b/nuttx/net/socket/net_poll.c
@@ -84,9 +84,9 @@
 
 struct net_poll_s
 {
-  FAR struct socket *psock;      /* Needed to handle loss of connection */
-  struct pollfd *fds;            /* Needed to handle poll events */
-  FAR struct uip_callback_s *cb; /* Needed to teardown the poll */
+  FAR struct socket *psock;        /* Needed to handle loss of connection */
+  struct pollfd *fds;              /* Needed to handle poll events */
+  FAR struct devif_callback_s *cb; /* Needed to teardown the poll */
 };
 
 /****************************************************************************
@@ -188,7 +188,7 @@ static inline int net_pollsetup(FAR struct socket *psock,
 {
   FAR struct tcp_conn_s *conn = psock->s_conn;
   FAR struct net_poll_s *info;
-  FAR struct uip_callback_s *cb;
+  FAR struct devif_callback_s *cb;
   net_lock_t flags;
   int ret;
 
diff --git a/nuttx/net/socket/net_sendfile.c b/nuttx/net/socket/net_sendfile.c
index bc4181ab4..41631c559 100644
--- a/nuttx/net/socket/net_sendfile.c
+++ b/nuttx/net/socket/net_sendfile.c
@@ -87,18 +87,18 @@
 
 struct sendfile_s
 {
-  FAR struct socket         *snd_sock;    /* Points to the parent socket structure */
-  FAR struct uip_callback_s *snd_datacb;  /* Data callback */
-  FAR struct uip_callback_s *snd_ackcb;   /* ACK callback */
-  FAR struct file           *snd_file;    /* File structure of the input file */
-  sem_t                      snd_sem;     /* Used to wake up the waiting thread */
-  off_t                      snd_foffset; /* Input file offset */
-  size_t                     snd_flen;    /* File length */
-  ssize_t                    snd_sent;    /* The number of bytes sent */
-  uint32_t                   snd_isn;     /* Initial sequence number */
-  uint32_t                   snd_acked;   /* The number of bytes acked */
+  FAR struct socket *snd_sock;    /* Points to the parent socket structure */
+  FAR struct devif_callback_s *snd_datacb; /* Data callback */
+  FAR struct devif_callback_s *snd_ackcb;  /* ACK callback */
+  FAR struct file   *snd_file;    /* File structure of the input file */
+  sem_t              snd_sem;     /* Used to wake up the waiting thread */
+  off_t              snd_foffset; /* Input file offset */
+  size_t             snd_flen;    /* File length */
+  ssize_t            snd_sent;    /* The number of bytes sent */
+  uint32_t           snd_isn;     /* Initial sequence number */
+  uint32_t           snd_acked;   /* The number of bytes acked */
 #if defined(CONFIG_NET_SOCKOPTS) && !defined(CONFIG_DISABLE_CLOCK)
-  uint32_t                   snd_time;    /* Last send time for determining timeout */
+  uint32_t           snd_time;    /* Last send time for determining timeout */
 #endif
 };
 
diff --git a/nuttx/net/socket/recvfrom.c b/nuttx/net/socket/recvfrom.c
index 709c9fe54..75b44d3ad 100644
--- a/nuttx/net/socket/recvfrom.c
+++ b/nuttx/net/socket/recvfrom.c
@@ -81,21 +81,21 @@
 #if defined(CONFIG_NET_UDP) || defined(CONFIG_NET_TCP)
 struct recvfrom_s
 {
-  FAR struct socket         *rf_sock;      /* The parent socket structure */
+  FAR struct socket       *rf_sock;      /* The parent socket structure */
 #if defined(CONFIG_NET_SOCKOPTS) && !defined(CONFIG_DISABLE_CLOCK)
-  uint32_t                   rf_starttime; /* rcv start time for determining timeout */
+  uint32_t                 rf_starttime; /* rcv start time for determining timeout */
 #endif
-  FAR struct uip_callback_s *rf_cb;        /* Reference to callback instance */
-  sem_t                      rf_sem;       /* Semaphore signals recv completion */
-  size_t                     rf_buflen;    /* Length of receive buffer */
-  uint8_t                   *rf_buffer;    /* Pointer to receive buffer */
+  FAR struct devif_callback_s *rf_cb;    /* Reference to callback instance */
+  sem_t                    rf_sem;       /* Semaphore signals recv completion */
+  size_t                   rf_buflen;    /* Length of receive buffer */
+  uint8_t                 *rf_buffer;    /* Pointer to receive buffer */
 #ifdef CONFIG_NET_IPv6
-  FAR struct sockaddr_in6   *rf_from;      /* Address of sender */
+  FAR struct sockaddr_in6 *rf_from;      /* Address of sender */
 #else
-  FAR struct sockaddr_in    *rf_from;      /* Address of sender */
+  FAR struct sockaddr_in  *rf_from;      /* Address of sender */
 #endif
-  size_t                     rf_recvlen;   /* The received length */
-  int                        rf_result;    /* Success:OK, failure:negated errno */
+  size_t                   rf_recvlen;   /* The received length */
+  int                      rf_result;    /* Success:OK, failure:negated errno */
 };
 #endif /* CONFIG_NET_UDP || CONFIG_NET_TCP */
 
diff --git a/nuttx/net/socket/sendto.c b/nuttx/net/socket/sendto.c
index 91e7ed544..e8f46afe8 100644
--- a/nuttx/net/socket/sendto.c
+++ b/nuttx/net/socket/sendto.c
@@ -87,14 +87,14 @@
 struct sendto_s
 {
 #ifdef CONFIG_NET_SENDTO_TIMEOUT
-  FAR struct socket *st_sock;       /* Points to the parent socket structure */
-  uint32_t st_time;                 /* Last send time for determining timeout */
+  FAR struct socket *st_sock;         /* Points to the parent socket structure */
+  uint32_t st_time;                   /* Last send time for determining timeout */
 #endif
-  FAR struct uip_callback_s *st_cb; /* Reference to callback instance */
-  sem_t st_sem;                     /* Semaphore signals sendto completion */
-  uint16_t st_buflen;               /* Length of send buffer (error if <0) */
-  const char *st_buffer;            /* Pointer to send buffer */
-  int st_sndlen;                    /* Result of the send (length sent or negated errno) */
+  FAR struct devif_callback_s *st_cb; /* Reference to callback instance */
+  sem_t st_sem;                       /* Semaphore signals sendto completion */
+  uint16_t st_buflen;                 /* Length of send buffer (error if <0) */
+  const char *st_buffer;              /* Pointer to send buffer */
+  int st_sndlen;                      /* Result of the send (length sent or negated errno) */
 };
 
 /****************************************************************************