aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp
diff options
context:
space:
mode:
Diffstat (limited to 'net/dccp')
-rw-r--r--net/dccp/dccp.h2
-rw-r--r--net/dccp/minisocks.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/dccp/dccp.h b/net/dccp/dccp.h
index 583490aaf56f..5818032e35a9 100644
--- a/net/dccp/dccp.h
+++ b/net/dccp/dccp.h
@@ -357,7 +357,7 @@ static inline int dccp_bad_service_code(const struct sock *sk,
357struct dccp_skb_cb { 357struct dccp_skb_cb {
358 union { 358 union {
359 struct inet_skb_parm h4; 359 struct inet_skb_parm h4;
360#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE) 360#if IS_ENABLED(CONFIG_IPV6)
361 struct inet6_skb_parm h6; 361 struct inet6_skb_parm h6;
362#endif 362#endif
363 } header; 363 } header;
diff --git a/net/dccp/minisocks.c b/net/dccp/minisocks.c
index b50d5fd3d696..5a7f90bbffac 100644
--- a/net/dccp/minisocks.c
+++ b/net/dccp/minisocks.c
@@ -53,7 +53,7 @@ void dccp_time_wait(struct sock *sk, int state, int timeo)
53 if (tw != NULL) { 53 if (tw != NULL) {
54 const struct inet_connection_sock *icsk = inet_csk(sk); 54 const struct inet_connection_sock *icsk = inet_csk(sk);
55 const int rto = (icsk->icsk_rto << 2) - (icsk->icsk_rto >> 1); 55 const int rto = (icsk->icsk_rto << 2) - (icsk->icsk_rto >> 1);
56#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) 56#if IS_ENABLED(CONFIG_IPV6)
57 if (tw->tw_family == PF_INET6) { 57 if (tw->tw_family == PF_INET6) {
58 const struct ipv6_pinfo *np = inet6_sk(sk); 58 const struct ipv6_pinfo *np = inet6_sk(sk);
59 struct inet6_timewait_sock *tw6; 59 struct inet6_timewait_sock *tw6;