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/devif/devif_input.c | |
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/devif/devif_input.c')
-rw-r--r-- | nuttx/net/devif/devif_input.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nuttx/net/devif/devif_input.c b/nuttx/net/devif/devif_input.c index ec14b1ae3..56c73bc61 100644 --- a/nuttx/net/devif/devif_input.c +++ b/nuttx/net/devif/devif_input.c @@ -413,7 +413,7 @@ int uip_input(FAR struct net_driver_s *dev) #if defined(CONFIG_NET_BROADCAST) && defined(CONFIG_NET_UDP) if (pbuf->proto == UIP_PROTO_UDP && #ifndef CONFIG_NET_IPv6 - net_ipaddr_cmp(uip_ip4addr_conv(pbuf->destipaddr), g_alloneaddr)) + net_ipaddr_cmp(net_ip4addr_conv32(pbuf->destipaddr), g_alloneaddr)) #else net_ipaddr_cmp(pbuf->destipaddr, g_alloneaddr)) #endif @@ -457,10 +457,10 @@ int uip_input(FAR struct net_driver_s *dev) { /* Check if the packet is destined for our IP address. */ #ifndef CONFIG_NET_IPv6 - if (!net_ipaddr_cmp(uip_ip4addr_conv(pbuf->destipaddr), dev->d_ipaddr)) + if (!net_ipaddr_cmp(net_ip4addr_conv32(pbuf->destipaddr), dev->d_ipaddr)) { #ifdef CONFIG_NET_IGMP - net_ipaddr_t destip = uip_ip4addr_conv(pbuf->destipaddr); + net_ipaddr_t destip = net_ip4addr_conv32(pbuf->destipaddr); if (igmp_grpfind(dev, &destip) == NULL) #endif { |