9 files changed, 22 insertions, 22 deletions
diff --git a/nuttx/net/igmp/igmp.h b/nuttx/net/igmp/igmp.h
index 1f33fb872..2285dbd8b 100644
--- a/nuttx/net/igmp/igmp.h
+++ b/nuttx/net/igmp/igmp.h
@@ -76,18 +76,18 @@ void igmp_initialize(void);
 
 /* Defined in igmp_input.c **************************************************/
 
-void igmp_input(struct uip_driver_s *dev);
+void igmp_input(struct net_driver_s *dev);
 
 /* Defined in igmp_group.c **************************************************/
 
 void igmp_grpinit(void);
-FAR struct igmp_group_s *igmp_grpalloc(FAR struct uip_driver_s *dev,
+FAR struct igmp_group_s *igmp_grpalloc(FAR struct net_driver_s *dev,
                                        FAR const uip_ipaddr_t *addr);
-FAR struct igmp_group_s *igmp_grpfind(FAR struct uip_driver_s *dev,
+FAR struct igmp_group_s *igmp_grpfind(FAR struct net_driver_s *dev,
                                       FAR const uip_ipaddr_t *addr);
-FAR struct igmp_group_s *igmp_grpallocfind(FAR struct uip_driver_s *dev,
+FAR struct igmp_group_s *igmp_grpallocfind(FAR struct net_driver_s *dev,
                                            FAR const uip_ipaddr_t *addr);
-void igmp_grpfree(FAR struct uip_driver_s *dev,
+void igmp_grpfree(FAR struct net_driver_s *dev,
                   FAR struct igmp_group_s *group);
 
 /* Defined in igmp_msg.c ****************************************************/
@@ -97,11 +97,11 @@ void igmp_waitmsg(FAR struct igmp_group_s *group, uint8_t msgid);
 
 /* Defined in igmp_poll.c ***************************************************/
 
-void igmp_poll(FAR struct uip_driver_s *dev);
+void igmp_poll(FAR struct net_driver_s *dev);
 
 /* Defined in igmp_send.c ***************************************************/
 
-void igmp_send(FAR struct uip_driver_s *dev, FAR struct igmp_group_s *group,
+void igmp_send(FAR struct net_driver_s *dev, FAR struct igmp_group_s *group,
                   FAR uip_ipaddr_t *dest);
 
 /* Defined in igmp_timer.c **************************************************/
@@ -113,8 +113,8 @@ bool igmp_cmptimer(FAR struct igmp_group_s *group, int maxticks);
 
 /* Defined in igmp_mcastmac *************************************************/
 
-void igmp_addmcastmac(FAR struct uip_driver_s *dev, FAR uip_ipaddr_t *ip);
-void igmp_removemcastmac(FAR struct uip_driver_s *dev, FAR uip_ipaddr_t *ip);
+void igmp_addmcastmac(FAR struct net_driver_s *dev, FAR uip_ipaddr_t *ip);
+void igmp_removemcastmac(FAR struct net_driver_s *dev, FAR uip_ipaddr_t *ip);
 
 #undef EXTERN
 #ifdef __cplusplus
diff --git a/nuttx/net/igmp/igmp_group.c b/nuttx/net/igmp/igmp_group.c
index 85bfa1a0c..f0b3e5399 100644
--- a/nuttx/net/igmp/igmp_group.c
+++ b/nuttx/net/igmp/igmp_group.c
@@ -219,7 +219,7 @@ void igmp_grpinit(void)
  *
  ****************************************************************************/
 
-FAR struct igmp_group_s *igmp_grpalloc(FAR struct uip_driver_s *dev,
+FAR struct igmp_group_s *igmp_grpalloc(FAR struct net_driver_s *dev,
                                        FAR const uip_ipaddr_t *addr)
 {
   FAR struct igmp_group_s *group;
@@ -282,7 +282,7 @@ FAR struct igmp_group_s *igmp_grpalloc(FAR struct uip_driver_s *dev,
  *
  ****************************************************************************/
 
-FAR struct igmp_group_s *igmp_grpfind(FAR struct uip_driver_s *dev,
+FAR struct igmp_group_s *igmp_grpfind(FAR struct net_driver_s *dev,
                                       FAR const uip_ipaddr_t *addr)
 {
   FAR struct igmp_group_s *group;
@@ -323,7 +323,7 @@ FAR struct igmp_group_s *igmp_grpfind(FAR struct uip_driver_s *dev,
  *
  ****************************************************************************/
 
-FAR struct igmp_group_s *igmp_grpallocfind(FAR struct uip_driver_s *dev,
+FAR struct igmp_group_s *igmp_grpallocfind(FAR struct net_driver_s *dev,
                                            FAR const uip_ipaddr_t *addr)
 {
   FAR struct igmp_group_s *group = igmp_grpfind(dev, addr);
@@ -349,7 +349,7 @@ FAR struct igmp_group_s *igmp_grpallocfind(FAR struct uip_driver_s *dev,
  *
  ****************************************************************************/
 
-void igmp_grpfree(FAR struct uip_driver_s *dev, FAR struct igmp_group_s *group)
+void igmp_grpfree(FAR struct net_driver_s *dev, FAR struct igmp_group_s *group)
 {
   net_lock_t flags;
 
diff --git a/nuttx/net/igmp/igmp_initialize.c b/nuttx/net/igmp/igmp_initialize.c
index 1d751c487..f0ea8c4b5 100644
--- a/nuttx/net/igmp/igmp_initialize.c
+++ b/nuttx/net/igmp/igmp_initialize.c
@@ -103,7 +103,7 @@ void igmp_initialize(void)
  *
  ****************************************************************************/
 
-void igmp_devinit(struct uip_driver_s *dev)
+void igmp_devinit(struct net_driver_s *dev)
 {
   nvdbg("IGMP initializing dev %p\n", dev);
   DEBUGASSERT(dev->grplist.head == NULL);
diff --git a/nuttx/net/igmp/igmp_input.c b/nuttx/net/igmp/igmp_input.c
index 241294d01..76061bb82 100644
--- a/nuttx/net/igmp/igmp_input.c
+++ b/nuttx/net/igmp/igmp_input.c
@@ -113,7 +113,7 @@
  *
  ****************************************************************************/
 
-void igmp_input(struct uip_driver_s *dev)
+void igmp_input(struct net_driver_s *dev)
 {
   FAR struct igmp_group_s *group;
   uip_ipaddr_t destipaddr;
diff --git a/nuttx/net/igmp/igmp_join.c b/nuttx/net/igmp/igmp_join.c
index a8d4a19d3..7e3540e07 100644
--- a/nuttx/net/igmp/igmp_join.c
+++ b/nuttx/net/igmp/igmp_join.c
@@ -122,7 +122,7 @@
  *
  ****************************************************************************/
 
-int igmp_joingroup(struct uip_driver_s *dev, FAR const struct in_addr *grpaddr)
+int igmp_joingroup(struct net_driver_s *dev, FAR const struct in_addr *grpaddr)
 {
   struct igmp_group_s *group;
 
diff --git a/nuttx/net/igmp/igmp_leave.c b/nuttx/net/igmp/igmp_leave.c
index 58e28771c..65cffc108 100644
--- a/nuttx/net/igmp/igmp_leave.c
+++ b/nuttx/net/igmp/igmp_leave.c
@@ -129,7 +129,7 @@
  *
  ****************************************************************************/
 
-int igmp_leavegroup(struct uip_driver_s *dev, FAR const struct in_addr *grpaddr)
+int igmp_leavegroup(struct net_driver_s *dev, FAR const struct in_addr *grpaddr)
 {
   struct igmp_group_s *group;
   net_lock_t flags;
diff --git a/nuttx/net/igmp/igmp_mcastmac.c b/nuttx/net/igmp/igmp_mcastmac.c
index b4de341c0..42dbf0407 100644
--- a/nuttx/net/igmp/igmp_mcastmac.c
+++ b/nuttx/net/igmp/igmp_mcastmac.c
@@ -99,7 +99,7 @@ static void uip_mcastmac(uip_ipaddr_t *ip, FAR uint8_t *mac)
  *
  ****************************************************************************/
 
-void igmp_addmcastmac(FAR struct uip_driver_s *dev, FAR uip_ipaddr_t *ip)
+void igmp_addmcastmac(FAR struct net_driver_s *dev, FAR uip_ipaddr_t *ip)
 {
   uint8_t mcastmac[6];
 
@@ -119,7 +119,7 @@ void igmp_addmcastmac(FAR struct uip_driver_s *dev, FAR uip_ipaddr_t *ip)
  *
  ****************************************************************************/
 
-void igmp_removemcastmac(FAR struct uip_driver_s *dev, FAR uip_ipaddr_t *ip)
+void igmp_removemcastmac(FAR struct net_driver_s *dev, FAR uip_ipaddr_t *ip)
 {
   uint8_t mcastmac[6];
 
diff --git a/nuttx/net/igmp/igmp_poll.c b/nuttx/net/igmp/igmp_poll.c
index bcc689523..48b4f39dc 100644
--- a/nuttx/net/igmp/igmp_poll.c
+++ b/nuttx/net/igmp/igmp_poll.c
@@ -79,7 +79,7 @@
  *
  ****************************************************************************/
 
-static inline void uip_schedsend(FAR struct uip_driver_s *dev, FAR struct igmp_group_s *group)
+static inline void uip_schedsend(FAR struct net_driver_s *dev, FAR struct igmp_group_s *group)
 {
   uip_ipaddr_t *dest;
 
@@ -142,7 +142,7 @@ static inline void uip_schedsend(FAR struct uip_driver_s *dev, FAR struct igmp_g
  *
  ****************************************************************************/
 
-void igmp_poll(FAR struct uip_driver_s *dev)
+void igmp_poll(FAR struct net_driver_s *dev)
 {
   FAR struct igmp_group_s *group;
 
diff --git a/nuttx/net/igmp/igmp_send.c b/nuttx/net/igmp/igmp_send.c
index 2398215b9..a73c16a86 100644
--- a/nuttx/net/igmp/igmp_send.c
+++ b/nuttx/net/igmp/igmp_send.c
@@ -120,7 +120,7 @@ static uint16_t igmp_chksum(FAR uint8_t *buffer, int buflen)
  *
  ****************************************************************************/
 
-void igmp_send(FAR struct uip_driver_s *dev, FAR struct igmp_group_s *group,
+void igmp_send(FAR struct net_driver_s *dev, FAR struct igmp_group_s *group,
                FAR uip_ipaddr_t *destipaddr)
 {
   nllvdbg("msgid: %02x destipaddr: %08x\n", group->msgid, (int)*destipaddr);