diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-06-29 12:22:50 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-06-29 12:22:50 -0600 |
commit | 5c4d51bb64d37019f2991fe2cc7615b5f64faf80 (patch) | |
tree | 6d5c9cbbb485dd5017d6fc73e756b5166999f032 /nuttx/net/igmp | |
parent | 1deaf2a9634576bf0e0f35a24911c3f22215fbd2 (diff) | |
download | px4-nuttx-5c4d51bb64d37019f2991fe2cc7615b5f64faf80.tar.gz px4-nuttx-5c4d51bb64d37019f2991fe2cc7615b5f64faf80.tar.bz2 px4-nuttx-5c4d51bb64d37019f2991fe2cc7615b5f64faf80.zip |
NET: Renaming of IP address types
Diffstat (limited to 'nuttx/net/igmp')
-rw-r--r-- | nuttx/net/igmp/igmp.h | 12 | ||||
-rw-r--r-- | nuttx/net/igmp/igmp_group.c | 6 | ||||
-rw-r--r-- | nuttx/net/igmp/igmp_initialize.c | 4 | ||||
-rw-r--r-- | nuttx/net/igmp/igmp_input.c | 4 | ||||
-rw-r--r-- | nuttx/net/igmp/igmp_join.c | 2 | ||||
-rw-r--r-- | nuttx/net/igmp/igmp_leave.c | 2 | ||||
-rw-r--r-- | nuttx/net/igmp/igmp_mcastmac.c | 6 | ||||
-rw-r--r-- | nuttx/net/igmp/igmp_poll.c | 2 | ||||
-rw-r--r-- | nuttx/net/igmp/igmp_send.c | 2 |
9 files changed, 20 insertions, 20 deletions
diff --git a/nuttx/net/igmp/igmp.h b/nuttx/net/igmp/igmp.h index 2285dbd8b..a1b33c8b2 100644 --- a/nuttx/net/igmp/igmp.h +++ b/nuttx/net/igmp/igmp.h @@ -82,11 +82,11 @@ void igmp_input(struct net_driver_s *dev); void igmp_grpinit(void); FAR struct igmp_group_s *igmp_grpalloc(FAR struct net_driver_s *dev, - FAR const uip_ipaddr_t *addr); + FAR const net_ipaddr_t *addr); FAR struct igmp_group_s *igmp_grpfind(FAR struct net_driver_s *dev, - FAR const uip_ipaddr_t *addr); + FAR const net_ipaddr_t *addr); FAR struct igmp_group_s *igmp_grpallocfind(FAR struct net_driver_s *dev, - FAR const uip_ipaddr_t *addr); + FAR const net_ipaddr_t *addr); void igmp_grpfree(FAR struct net_driver_s *dev, FAR struct igmp_group_s *group); @@ -102,7 +102,7 @@ void igmp_poll(FAR struct net_driver_s *dev); /* Defined in igmp_send.c ***************************************************/ void igmp_send(FAR struct net_driver_s *dev, FAR struct igmp_group_s *group, - FAR uip_ipaddr_t *dest); + FAR net_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 net_driver_s *dev, FAR uip_ipaddr_t *ip); -void igmp_removemcastmac(FAR struct net_driver_s *dev, FAR uip_ipaddr_t *ip); +void igmp_addmcastmac(FAR struct net_driver_s *dev, FAR net_ipaddr_t *ip); +void igmp_removemcastmac(FAR struct net_driver_s *dev, FAR net_ipaddr_t *ip); #undef EXTERN #ifdef __cplusplus diff --git a/nuttx/net/igmp/igmp_group.c b/nuttx/net/igmp/igmp_group.c index a4900eb8a..3c76339ad 100644 --- a/nuttx/net/igmp/igmp_group.c +++ b/nuttx/net/igmp/igmp_group.c @@ -220,7 +220,7 @@ void igmp_grpinit(void) ****************************************************************************/ FAR struct igmp_group_s *igmp_grpalloc(FAR struct net_driver_s *dev, - FAR const uip_ipaddr_t *addr) + FAR const net_ipaddr_t *addr) { FAR struct igmp_group_s *group; net_lock_t flags; @@ -283,7 +283,7 @@ FAR struct igmp_group_s *igmp_grpalloc(FAR struct net_driver_s *dev, ****************************************************************************/ FAR struct igmp_group_s *igmp_grpfind(FAR struct net_driver_s *dev, - FAR const uip_ipaddr_t *addr) + FAR const net_ipaddr_t *addr) { FAR struct igmp_group_s *group; net_lock_t flags; @@ -324,7 +324,7 @@ FAR struct igmp_group_s *igmp_grpfind(FAR struct net_driver_s *dev, ****************************************************************************/ FAR struct igmp_group_s *igmp_grpallocfind(FAR struct net_driver_s *dev, - FAR const uip_ipaddr_t *addr) + FAR const net_ipaddr_t *addr) { FAR struct igmp_group_s *group = igmp_grpfind(dev, addr); diff --git a/nuttx/net/igmp/igmp_initialize.c b/nuttx/net/igmp/igmp_initialize.c index f2a4979cb..1ad5e9009 100644 --- a/nuttx/net/igmp/igmp_initialize.c +++ b/nuttx/net/igmp/igmp_initialize.c @@ -67,8 +67,8 @@ * Public Data ****************************************************************************/ -uip_ipaddr_t g_allsystems; -uip_ipaddr_t g_allrouters; +net_ipaddr_t g_allsystems; +net_ipaddr_t g_allrouters; /**************************************************************************** * Public Functions diff --git a/nuttx/net/igmp/igmp_input.c b/nuttx/net/igmp/igmp_input.c index 2d0837122..daae46f14 100644 --- a/nuttx/net/igmp/igmp_input.c +++ b/nuttx/net/igmp/igmp_input.c @@ -116,8 +116,8 @@ void igmp_input(struct net_driver_s *dev) { FAR struct igmp_group_s *group; - uip_ipaddr_t destipaddr; - uip_ipaddr_t grpaddr; + net_ipaddr_t destipaddr; + net_ipaddr_t grpaddr; unsigned int ticks; nllvdbg("IGMP message: %04x%04x\n", IGMPBUF->destipaddr[1], IGMPBUF->destipaddr[0]); diff --git a/nuttx/net/igmp/igmp_join.c b/nuttx/net/igmp/igmp_join.c index b817d9c7e..1f40acc17 100644 --- a/nuttx/net/igmp/igmp_join.c +++ b/nuttx/net/igmp/igmp_join.c @@ -150,7 +150,7 @@ int igmp_joingroup(struct net_driver_s *dev, FAR const struct in_addr *grpaddr) /* Add the group (MAC) address to the ether drivers MAC filter list */ - igmp_addmcastmac(dev, (FAR uip_ipaddr_t *)&grpaddr->s_addr); + igmp_addmcastmac(dev, (FAR net_ipaddr_t *)&grpaddr->s_addr); return OK; } diff --git a/nuttx/net/igmp/igmp_leave.c b/nuttx/net/igmp/igmp_leave.c index e05e900aa..3021fcb8e 100644 --- a/nuttx/net/igmp/igmp_leave.c +++ b/nuttx/net/igmp/igmp_leave.c @@ -171,7 +171,7 @@ int igmp_leavegroup(struct net_driver_s *dev, FAR const struct in_addr *grpaddr) /* And remove the group address from the ethernet drivers MAC filter set */ - igmp_removemcastmac(dev, (FAR uip_ipaddr_t *)&grpaddr->s_addr); + igmp_removemcastmac(dev, (FAR net_ipaddr_t *)&grpaddr->s_addr); return OK; } diff --git a/nuttx/net/igmp/igmp_mcastmac.c b/nuttx/net/igmp/igmp_mcastmac.c index c42a919e2..799b839ed 100644 --- a/nuttx/net/igmp/igmp_mcastmac.c +++ b/nuttx/net/igmp/igmp_mcastmac.c @@ -72,7 +72,7 @@ * ****************************************************************************/ -static void igmp_mcastmac(uip_ipaddr_t *ip, FAR uint8_t *mac) +static void igmp_mcastmac(net_ipaddr_t *ip, FAR uint8_t *mac) { /* This mapping is from the IETF IN RFC 1700 */ @@ -99,7 +99,7 @@ static void igmp_mcastmac(uip_ipaddr_t *ip, FAR uint8_t *mac) * ****************************************************************************/ -void igmp_addmcastmac(FAR struct net_driver_s *dev, FAR uip_ipaddr_t *ip) +void igmp_addmcastmac(FAR struct net_driver_s *dev, FAR net_ipaddr_t *ip) { uint8_t mcastmac[6]; @@ -119,7 +119,7 @@ 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) +void igmp_removemcastmac(FAR struct net_driver_s *dev, FAR net_ipaddr_t *ip) { uint8_t mcastmac[6]; diff --git a/nuttx/net/igmp/igmp_poll.c b/nuttx/net/igmp/igmp_poll.c index 2722b318f..cdef3111e 100644 --- a/nuttx/net/igmp/igmp_poll.c +++ b/nuttx/net/igmp/igmp_poll.c @@ -82,7 +82,7 @@ static inline void igmp_sched_send(FAR struct net_driver_s *dev, FAR struct igmp_group_s *group) { - uip_ipaddr_t *dest; + net_ipaddr_t *dest; /* Check what kind of message we need to send. There are only two * possibilities: diff --git a/nuttx/net/igmp/igmp_send.c b/nuttx/net/igmp/igmp_send.c index 2658f5767..a4735f622 100644 --- a/nuttx/net/igmp/igmp_send.c +++ b/nuttx/net/igmp/igmp_send.c @@ -121,7 +121,7 @@ static uint16_t igmp_chksum(FAR uint8_t *buffer, int buflen) ****************************************************************************/ void igmp_send(FAR struct net_driver_s *dev, FAR struct igmp_group_s *group, - FAR uip_ipaddr_t *destipaddr) + FAR net_ipaddr_t *destipaddr) { nllvdbg("msgid: %02x destipaddr: %08x\n", group->msgid, (int)*destipaddr); |