diff options
Diffstat (limited to 'include/net/inet_sock.h')
-rw-r--r-- | include/net/inet_sock.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h index f941964a9931..e3e405106afe 100644 --- a/include/net/inet_sock.h +++ b/include/net/inet_sock.h | |||
@@ -71,7 +71,7 @@ struct ip_options_data { | |||
71 | 71 | ||
72 | struct inet_request_sock { | 72 | struct inet_request_sock { |
73 | struct request_sock req; | 73 | struct request_sock req; |
74 | #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) | 74 | #if IS_ENABLED(CONFIG_IPV6) |
75 | u16 inet6_rsk_offset; | 75 | u16 inet6_rsk_offset; |
76 | #endif | 76 | #endif |
77 | __be16 loc_port; | 77 | __be16 loc_port; |
@@ -139,7 +139,7 @@ struct rtable; | |||
139 | struct inet_sock { | 139 | struct inet_sock { |
140 | /* sk and pinet6 has to be the first two members of inet_sock */ | 140 | /* sk and pinet6 has to be the first two members of inet_sock */ |
141 | struct sock sk; | 141 | struct sock sk; |
142 | #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) | 142 | #if IS_ENABLED(CONFIG_IPV6) |
143 | struct ipv6_pinfo *pinet6; | 143 | struct ipv6_pinfo *pinet6; |
144 | #endif | 144 | #endif |
145 | /* Socket demultiplex comparisons on incoming packets. */ | 145 | /* Socket demultiplex comparisons on incoming packets. */ |
@@ -188,7 +188,7 @@ static inline void __inet_sk_copy_descendant(struct sock *sk_to, | |||
188 | memcpy(inet_sk(sk_to) + 1, inet_sk(sk_from) + 1, | 188 | memcpy(inet_sk(sk_to) + 1, inet_sk(sk_from) + 1, |
189 | sk_from->sk_prot->obj_size - ancestor_size); | 189 | sk_from->sk_prot->obj_size - ancestor_size); |
190 | } | 190 | } |
191 | #if !(defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)) | 191 | #if !(IS_ENABLED(CONFIG_IPV6)) |
192 | static inline void inet_sk_copy_descendant(struct sock *sk_to, | 192 | static inline void inet_sk_copy_descendant(struct sock *sk_to, |
193 | const struct sock *sk_from) | 193 | const struct sock *sk_from) |
194 | { | 194 | { |