aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/tcp.h
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2011-12-10 04:48:31 -0500
committerDavid S. Miller <davem@davemloft.net>2011-12-11 18:25:16 -0500
commitdfd56b8b38fff3586f36232db58e1e9f7885a605 (patch)
tree64c7142ebf4625939f68bd3603f1d37bacb20a73 /include/net/tcp.h
parent1ded132d4c3442aa3a619c94c245d7b5e0eb9731 (diff)
net: use IS_ENABLED(CONFIG_IPV6)
Instead of testing defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/tcp.h')
-rw-r--r--include/net/tcp.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 87e3c80bfa00..02f070d339ba 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -628,7 +628,7 @@ extern u32 __tcp_select_window(struct sock *sk);
628struct tcp_skb_cb { 628struct tcp_skb_cb {
629 union { 629 union {
630 struct inet_skb_parm h4; 630 struct inet_skb_parm h4;
631#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE) 631#if IS_ENABLED(CONFIG_IPV6)
632 struct inet6_skb_parm h6; 632 struct inet6_skb_parm h6;
633#endif 633#endif
634 } header; /* For incoming frames */ 634 } header; /* For incoming frames */
@@ -1152,7 +1152,7 @@ struct tcp6_md5sig_key {
1152/* - sock block */ 1152/* - sock block */
1153struct tcp_md5sig_info { 1153struct tcp_md5sig_info {
1154 struct tcp4_md5sig_key *keys4; 1154 struct tcp4_md5sig_key *keys4;
1155#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) 1155#if IS_ENABLED(CONFIG_IPV6)
1156 struct tcp6_md5sig_key *keys6; 1156 struct tcp6_md5sig_key *keys6;
1157 u32 entries6; 1157 u32 entries6;
1158 u32 alloced6; 1158 u32 alloced6;
@@ -1179,7 +1179,7 @@ struct tcp6_pseudohdr {
1179 1179
1180union tcp_md5sum_block { 1180union tcp_md5sum_block {
1181 struct tcp4_pseudohdr ip4; 1181 struct tcp4_pseudohdr ip4;
1182#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) 1182#if IS_ENABLED(CONFIG_IPV6)
1183 struct tcp6_pseudohdr ip6; 1183 struct tcp6_pseudohdr ip6;
1184#endif 1184#endif
1185}; 1185};