diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-06-29 13:20:00 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-06-29 13:20:00 -0600 |
| commit | 123d85fbe1dfa189d58db4af7d543e7fe166549e (patch) | |
| tree | c2d91b9511fb02caa7e15024ec847c1f4f72d67d /nuttx/net/igmp | |
| parent | db01dd7d4bb05dcb6a12131beeb18e9dff8c09ce (diff) | |
| download | nuttx-123d85fbe1dfa189d58db4af7d543e7fe166549e.tar.gz nuttx-123d85fbe1dfa189d58db4af7d543e7fe166549e.tar.bz2 nuttx-123d85fbe1dfa189d58db4af7d543e7fe166549e.zip | |
NET: Rename uiphdr_ipaddr_copy to net_ipaddr_hdrcopy, uip_ip4addr_conv to net_ip4addr_conv32, and uip_ethaddr_cmp to eth_addr_cmp
Diffstat (limited to 'nuttx/net/igmp')
| -rw-r--r-- | nuttx/net/igmp/igmp_input.c | 4 | ||||
| -rw-r--r-- | nuttx/net/igmp/igmp_send.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/nuttx/net/igmp/igmp_input.c b/nuttx/net/igmp/igmp_input.c index 8ec707c56..b3f2090bb 100644 --- a/nuttx/net/igmp/igmp_input.c +++ b/nuttx/net/igmp/igmp_input.c @@ -142,7 +142,7 @@ void igmp_input(struct net_driver_s *dev) /* Find the group (or create a new one) using the incoming IP address*/ - destipaddr = uip_ip4addr_conv(IGMPBUF->destipaddr); + destipaddr = net_ip4addr_conv32(IGMPBUF->destipaddr); group = igmp_grpallocfind(dev, &destipaddr); if (!group) { @@ -226,7 +226,7 @@ void igmp_input(struct net_driver_s *dev) */ IGMP_STATINCR(g_netstats.igmp.ucast_query); - grpaddr = uip_ip4addr_conv(IGMPBUF->grpaddr); + grpaddr = net_ip4addr_conv32(IGMPBUF->grpaddr); group = igmp_grpallocfind(dev, &grpaddr); ticks = igmp_decisec2tick((int)IGMPBUF->maxresp); if (IS_IDLEMEMBER(group->flags) || igmp_cmptimer(group, ticks)) diff --git a/nuttx/net/igmp/igmp_send.c b/nuttx/net/igmp/igmp_send.c index a4735f622..5134b2b51 100644 --- a/nuttx/net/igmp/igmp_send.c +++ b/nuttx/net/igmp/igmp_send.c @@ -154,8 +154,8 @@ void igmp_send(FAR struct net_driver_s *dev, FAR struct igmp_group_s *group, IGMPBUF->ttl = IGMP_TTL; IGMPBUF->proto = UIP_PROTO_IGMP; - uiphdr_ipaddr_copy(IGMPBUF->srcipaddr, &dev->d_ipaddr); - uiphdr_ipaddr_copy(IGMPBUF->destipaddr, destipaddr); + net_ipaddr_hdrcopy(IGMPBUF->srcipaddr, &dev->d_ipaddr); + net_ipaddr_hdrcopy(IGMPBUF->destipaddr, destipaddr); /* Calculate IP checksum. */ @@ -166,7 +166,7 @@ void igmp_send(FAR struct net_driver_s *dev, FAR struct igmp_group_s *group, IGMPBUF->type = group->msgid; IGMPBUF->maxresp = 0; - uiphdr_ipaddr_copy(IGMPBUF->grpaddr, &group->grpaddr); + net_ipaddr_hdrcopy(IGMPBUF->grpaddr, &group->grpaddr); /* Calculate the IGMP checksum. */ |