Commit dfd56b8b authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: use IS_ENABLED(CONFIG_IPV6) 



Instead of testing defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1ded132d

include/linux/errqueue.h

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ struct sock_extended_err { 
#ifdef __KERNEL__



#include <net/ip.h>

#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)

#if IS_ENABLED(CONFIG_IPV6)

#include <linux/ipv6.h>

#endif
@@ -34,7 +34,7 @@ struct sock_extended_err { 
struct sock_exterr_skb {

	union {

		struct inet_skb_parm	h4;

#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)

#if IS_ENABLED(CONFIG_IPV6)

		struct inet6_skb_parm	h6;

#endif

	} header;

include/linux/ipv6.h

+2 −2
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ struct tcp6_sock { 


extern int inet6_sk_rebuild_header(struct sock *sk);



#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

#if IS_ENABLED(CONFIG_IPV6)

static inline struct ipv6_pinfo * inet6_sk(const struct sock *__sk)

{

	return inet_sk(__sk)->pinet6;
@@ -515,7 +515,7 @@ static inline struct raw6_sock *raw6_sk(const struct sock *sk) 
#define inet6_rcv_saddr(__sk)	NULL

#define tcp_twsk_ipv6only(__sk)		0

#define inet_v6_ipv6only(__sk)		0

#endif /* defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) */

#endif /* IS_ENABLED(CONFIG_IPV6) */



#define INET6_MATCH(__sk, __net, __hash, __saddr, __daddr, __ports, __dif)\

	(((__sk)->sk_hash == (__hash)) && sock_net((__sk)) == (__net)	&& \

include/linux/lockd/lockd.h

+3 −3
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ static inline int __nlm_privileged_request4(const struct sockaddr *sap) 
	return ipv4_is_loopback(sin->sin_addr.s_addr);

}



#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

#if IS_ENABLED(CONFIG_IPV6)

static inline int __nlm_privileged_request6(const struct sockaddr *sap)

{

	const struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)sap;
@@ -314,12 +314,12 @@ static inline int __nlm_privileged_request6(const struct sockaddr *sap) 


	return ipv6_addr_type(&sin6->sin6_addr) & IPV6_ADDR_LOOPBACK;

}

#else	/* defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) */

#else	/* IS_ENABLED(CONFIG_IPV6) */

static inline int __nlm_privileged_request6(const struct sockaddr *sap)

{

	return 0;

}

#endif	/* defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) */

#endif	/* IS_ENABLED(CONFIG_IPV6) */



/*

 * Ensure incoming requests are from local privileged callers.

include/linux/sunrpc/clnt.h

+3 −3
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ static inline bool __rpc_copy_addr4(struct sockaddr *dst, 
	return true;

}



#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

#if IS_ENABLED(CONFIG_IPV6)

static inline bool __rpc_cmp_addr6(const struct sockaddr *sap1,

				   const struct sockaddr *sap2)

{
@@ -240,7 +240,7 @@ static inline bool __rpc_copy_addr6(struct sockaddr *dst, 
	dsin6->sin6_addr = ssin6->sin6_addr;

	return true;

}

#else	/* !(CONFIG_IPV6 || CONFIG_IPV6_MODULE) */

#else	/* !(IS_ENABLED(CONFIG_IPV6) */

static inline bool __rpc_cmp_addr6(const struct sockaddr *sap1,

				   const struct sockaddr *sap2)

{
@@ -252,7 +252,7 @@ static inline bool __rpc_copy_addr6(struct sockaddr *dst, 
{

	return false;

}

#endif	/* !(CONFIG_IPV6 || CONFIG_IPV6_MODULE) */

#endif	/* !(IS_ENABLED(CONFIG_IPV6) */



/**

 * rpc_cmp_addr - compare the address portion of two sockaddrs.

include/net/inet6_hashtables.h

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#define _INET6_HASHTABLES_H





#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)

#if IS_ENABLED(CONFIG_IPV6)

#include <linux/in6.h>

#include <linux/ipv6.h>

#include <linux/types.h>
@@ -110,5 +110,5 @@ extern struct sock *inet6_lookup(struct net *net, struct inet_hashinfo *hashinfo 
				 const struct in6_addr *saddr, const __be16 sport,

				 const struct in6_addr *daddr, const __be16 dport,

				 const int dif);

#endif /* defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE) */

#endif /* IS_ENABLED(CONFIG_IPV6) */

#endif /* _INET6_HASHTABLES_H */