Skip to content

Commit

Permalink
net: relax net_ip.h check
Browse files Browse the repository at this point in the history
This allows network stack headers to be included even if
no L3 networking support is enabled in Kconfig.

Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
  • Loading branch information
Andrew Boie authored and jukkar committed Jul 24, 2018
1 parent efb0080 commit 8e8dc1c
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions include/net/net_ip.h
Original file line number Diff line number Diff line change
Expand Up @@ -133,20 +133,13 @@ struct sockaddr_in_ptr {
struct in_addr *sin_addr; /* IPv4 address */
};

#if defined(CONFIG_NET_IPV6)
#define NET_SOCKADDR_MAX_SIZE (sizeof(struct sockaddr_in6))
#define NET_SOCKADDR_PTR_MAX_SIZE (sizeof(struct sockaddr_in6_ptr))
#elif defined(CONFIG_NET_IPV4)
#if defined(CONFIG_NET_IPV4) && !defined(CONFIG_NET_IPV6)
#define NET_SOCKADDR_MAX_SIZE (sizeof(struct sockaddr_in))
#define NET_SOCKADDR_PTR_MAX_SIZE (sizeof(struct sockaddr_in_ptr))
#else
#if !defined(CONFIG_NET_RAW_MODE)
#error "Either IPv6 or IPv4 needs to be selected."
#else
#define NET_SOCKADDR_MAX_SIZE (sizeof(struct sockaddr_in6))
#define NET_SOCKADDR_PTR_MAX_SIZE (sizeof(struct sockaddr_in6_ptr))
#endif
#endif

struct sockaddr {
sa_family_t sa_family;
Expand Down

0 comments on commit 8e8dc1c

Please sign in to comment.