aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp_timer.c
diff options
context:
space:
mode:
authorRichard Sailer <richard@weltraumpflege.org>2015-10-08 20:41:37 -0400
committerDavid S. Miller <davem@davemloft.net>2015-10-12 08:15:03 -0400
commit7533ce3055bbe9577276a847125b156c44a5bbce (patch)
tree11e352f49c080a32c05106dad1168ebb4ccc37f9 /net/ipv4/tcp_timer.c
parent3741873b4f73b572b8f8835e6bd114e08316a160 (diff)
tcp: change type of alive from int to bool
The alive parameter of tcp_orphan_retries, indicates whether the connection is assumed alive or not. In the function and all places calling it is used as a boolean value. Therefore this changes the type of alive to bool in the function definition and all calling locations. Since tcp_orphan_tries is a tcp_timer.c local function no change in any other file or header is necessary. Signed-off-by: Richard Sailer <richard@weltraumpflege.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_timer.c')
-rw-r--r--net/ipv4/tcp_timer.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
index 7149ebc820c7..c9c716a483e4 100644
--- a/net/ipv4/tcp_timer.c
+++ b/net/ipv4/tcp_timer.c
@@ -83,7 +83,7 @@ static int tcp_out_of_resources(struct sock *sk, bool do_reset)
83} 83}
84 84
85/* Calculate maximal number or retries on an orphaned socket. */ 85/* Calculate maximal number or retries on an orphaned socket. */
86static int tcp_orphan_retries(struct sock *sk, int alive) 86static int tcp_orphan_retries(struct sock *sk, bool alive)
87{ 87{
88 int retries = sysctl_tcp_orphan_retries; /* May be zero. */ 88 int retries = sysctl_tcp_orphan_retries; /* May be zero. */
89 89
@@ -184,7 +184,7 @@ static int tcp_write_timeout(struct sock *sk)
184 184
185 retry_until = sysctl_tcp_retries2; 185 retry_until = sysctl_tcp_retries2;
186 if (sock_flag(sk, SOCK_DEAD)) { 186 if (sock_flag(sk, SOCK_DEAD)) {
187 const int alive = icsk->icsk_rto < TCP_RTO_MAX; 187 const bool alive = icsk->icsk_rto < TCP_RTO_MAX;
188 188
189 retry_until = tcp_orphan_retries(sk, alive); 189 retry_until = tcp_orphan_retries(sk, alive);
190 do_reset = alive || 190 do_reset = alive ||
@@ -298,7 +298,7 @@ static void tcp_probe_timer(struct sock *sk)
298 298
299 max_probes = sysctl_tcp_retries2; 299 max_probes = sysctl_tcp_retries2;
300 if (sock_flag(sk, SOCK_DEAD)) { 300 if (sock_flag(sk, SOCK_DEAD)) {
301 const int alive = inet_csk_rto_backoff(icsk, TCP_RTO_MAX) < TCP_RTO_MAX; 301 const bool alive = inet_csk_rto_backoff(icsk, TCP_RTO_MAX) < TCP_RTO_MAX;
302 302
303 max_probes = tcp_orphan_retries(sk, alive); 303 max_probes = tcp_orphan_retries(sk, alive);
304 if (!alive && icsk->icsk_backoff >= max_probes) 304 if (!alive && icsk->icsk_backoff >= max_probes)