diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-06-25 09:52:36 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-06-25 09:52:36 -0600 |
| commit | c9165c6ab64da11033ddcb60e6dcbd72908be0bd (patch) | |
| tree | f6f750e09c354373e7a4aba38868ff05787c5ca6 /nuttx/net/igmp/igmp_join.c | |
| parent | 06868e7c06d42f4c9043b624bdcf56f6d1348d8a (diff) | |
| download | px4-nuttx-c9165c6ab64da11033ddcb60e6dcbd72908be0bd.tar.gz px4-nuttx-c9165c6ab64da11033ddcb60e6dcbd72908be0bd.tar.bz2 px4-nuttx-c9165c6ab64da11033ddcb60e6dcbd72908be0bd.zip | |
Clean up IGMP naming
Diffstat (limited to 'nuttx/net/igmp/igmp_join.c')
| -rw-r--r-- | nuttx/net/igmp/igmp_join.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/nuttx/net/igmp/igmp_join.c b/nuttx/net/igmp/igmp_join.c index 5dafb0dd6..9d239dd79 100644 --- a/nuttx/net/igmp/igmp_join.c +++ b/nuttx/net/igmp/igmp_join.c @@ -51,6 +51,7 @@ #include <nuttx/net/igmp.h> #include "uip/uip.h" +#include "igmp/igmp.h" #ifdef CONFIG_NET_IGMP @@ -128,27 +129,27 @@ int igmp_joingroup(struct uip_driver_s *dev, FAR const struct in_addr *grpaddr) /* Check if a this address is already in the group */ - group = uip_grpfind(dev, &grpaddr->s_addr); + group = igmp_grpfind(dev, &grpaddr->s_addr); if (!group) { /* No... allocate a new entry */ nvdbg("Join to new group: %08x\n", grpaddr->s_addr); - group = uip_grpalloc(dev, &grpaddr->s_addr); + group = igmp_grpalloc(dev, &grpaddr->s_addr); IGMP_STATINCR(uip_stat.igmp.joins); /* Send the Membership Report */ IGMP_STATINCR(uip_stat.igmp.report_sched); - uip_igmpwaitmsg(group, IGMPv2_MEMBERSHIP_REPORT); + igmp_waitmsg(group, IGMPv2_MEMBERSHIP_REPORT); /* And start the timer at 10*100 msec */ - uip_igmpstarttimer(group, 10); + igmp_starttimer(group, 10); /* Add the group (MAC) address to the ether drivers MAC filter list */ - uip_addmcastmac(dev, (FAR uip_ipaddr_t *)&grpaddr->s_addr); + igmp_addmcastmac(dev, (FAR uip_ipaddr_t *)&grpaddr->s_addr); return OK; } |