diff options
Diffstat (limited to 'include/net/ip.h')
| -rw-r--r-- | include/net/ip.h | 6 | 
1 files changed, 3 insertions, 3 deletions
diff --git a/include/net/ip.h b/include/net/ip.h index fd1561e88a1..775009f9eab 100644 --- a/include/net/ip.h +++ b/include/net/ip.h @@ -353,14 +353,14 @@ static inline void ip_ipgre_mc_map(__be32 naddr, const unsigned char *broadcast,  		memcpy(buf, &naddr, sizeof(naddr));  } -#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) +#if IS_ENABLED(CONFIG_IPV6)  #include <linux/ipv6.h>  #endif  static __inline__ void inet_reset_saddr(struct sock *sk)  {  	inet_sk(sk)->inet_rcv_saddr = inet_sk(sk)->inet_saddr = 0; -#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) +#if IS_ENABLED(CONFIG_IPV6)  	if (sk->sk_family == PF_INET6) {  		struct ipv6_pinfo *np = inet6_sk(sk); @@ -379,7 +379,7 @@ static inline int sk_mc_loop(struct sock *sk)  	switch (sk->sk_family) {  	case AF_INET:  		return inet_sk(sk)->mc_loop; -#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) +#if IS_ENABLED(CONFIG_IPV6)  	case AF_INET6:  		return inet6_sk(sk)->mc_loop;  #endif  |