diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2011-12-10 04:48:31 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-12-11 18:25:16 -0500 |
commit | dfd56b8b38fff3586f36232db58e1e9f7885a605 (patch) | |
tree | 64c7142ebf4625939f68bd3603f1d37bacb20a73 /net/ipv4/tcp_timer.c | |
parent | 1ded132d4c3442aa3a619c94c245d7b5e0eb9731 (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 'net/ipv4/tcp_timer.c')
-rw-r--r-- | net/ipv4/tcp_timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c index 2e0f0af76c19..aa39a692f4c8 100644 --- a/net/ipv4/tcp_timer.c +++ b/net/ipv4/tcp_timer.c | |||
@@ -340,7 +340,7 @@ void tcp_retransmit_timer(struct sock *sk) | |||
340 | &inet->inet_daddr, ntohs(inet->inet_dport), | 340 | &inet->inet_daddr, ntohs(inet->inet_dport), |
341 | inet->inet_num, tp->snd_una, tp->snd_nxt); | 341 | inet->inet_num, tp->snd_una, tp->snd_nxt); |
342 | } | 342 | } |
343 | #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) | 343 | #if IS_ENABLED(CONFIG_IPV6) |
344 | else if (sk->sk_family == AF_INET6) { | 344 | else if (sk->sk_family == AF_INET6) { |
345 | struct ipv6_pinfo *np = inet6_sk(sk); | 345 | struct ipv6_pinfo *np = inet6_sk(sk); |
346 | LIMIT_NETDEBUG(KERN_DEBUG "TCP: Peer %pI6:%u/%u unexpectedly shrunk window %u:%u (repaired)\n", | 346 | LIMIT_NETDEBUG(KERN_DEBUG "TCP: Peer %pI6:%u/%u unexpectedly shrunk window %u:%u (repaired)\n", |