Skip to content

Commit

Permalink
tcp: change type of alive from int to bool
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Richard Sailer authored and David S. Miller committed Oct 12, 2015
1 parent 3741873 commit 7533ce3
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions net/ipv4/tcp_timer.c
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ static int tcp_out_of_resources(struct sock *sk, bool do_reset)
}

/* Calculate maximal number or retries on an orphaned socket. */
static int tcp_orphan_retries(struct sock *sk, int alive)
static int tcp_orphan_retries(struct sock *sk, bool alive)
{
int retries = sysctl_tcp_orphan_retries; /* May be zero. */

Expand Down Expand Up @@ -184,7 +184,7 @@ static int tcp_write_timeout(struct sock *sk)

retry_until = sysctl_tcp_retries2;
if (sock_flag(sk, SOCK_DEAD)) {
const int alive = icsk->icsk_rto < TCP_RTO_MAX;
const bool alive = icsk->icsk_rto < TCP_RTO_MAX;

retry_until = tcp_orphan_retries(sk, alive);
do_reset = alive ||
Expand Down Expand Up @@ -298,7 +298,7 @@ static void tcp_probe_timer(struct sock *sk)

max_probes = sysctl_tcp_retries2;
if (sock_flag(sk, SOCK_DEAD)) {
const int alive = inet_csk_rto_backoff(icsk, TCP_RTO_MAX) < TCP_RTO_MAX;
const bool alive = inet_csk_rto_backoff(icsk, TCP_RTO_MAX) < TCP_RTO_MAX;

max_probes = tcp_orphan_retries(sk, alive);
if (!alive && icsk->icsk_backoff >= max_probes)
Expand Down

0 comments on commit 7533ce3

Please sign in to comment.