Rename uip_driver_s net_driver_s

11 files changed, 26 insertions, 26 deletions

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)
     {