patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

net: Fix compilation when IPv6 is disabled

Browse source 
Change-Id: If1c7b8e3befa48b405aa5f6d4d04a87c72afc5b5
Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
This commit is contained in:
Jukka Rissanen 2016-06-16 11:04:07 +03:00
parent 482d7c69cc
commit 148e1ea7aa
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
net/yaip/net_core.c
View file

@ -42,9 +42,8 @@
#include "net_private.h"
#if defined(CONFIG_NET_IPV6)
#include "icmpv6.h"
#endif
#include "ipv6.h"
#if defined(CONFIG_NET_IPV4)
#include "icmpv4.h"

4
net/yaip/net_if.c
View file

@ -619,6 +619,7 @@ bool net_if_ipv4_addr_mask_cmp(struct net_if *iface,
struct in6_addr *net_if_ipv6_get_ll(struct net_if *iface,
enum net_addr_state addr_state)
{
#if defined(CONFIG_NET_IPV6)
int i;
for (i = 0; i < NET_IF_MAX_IPV6_ADDR; i++) {
@ -632,6 +633,7 @@ struct in6_addr *net_if_ipv6_get_ll(struct net_if *iface,
return &iface->ipv6.unicast[i].address.in6_addr;
}
}
#endif
return NULL;
}
@ -663,11 +665,13 @@ static inline uint8_t get_length(struct in6_addr *src, struct in6_addr *dst)
static inline bool is_proper_ipv6_address(struct net_if_addr *addr)
{
#if defined(CONFIG_NET_IPV6)
if (addr->is_used && addr->addr_state == NET_ADDR_PREFERRED &&
addr->address.family == AF_INET6 &&
!net_is_ipv6_ll_addr(&addr->address.in6_addr)) {
return true;
}
#endif
return false;
}