diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2009-08-29 10:48:54 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-29 10:48:54 +0400 |
| commit | df19a6267705456f463871ae2aabc44299909d2a (patch) | |
| tree | 59654abf9eb5dc58c9f8773dde5738b5bcb18312 /net/ipv4/tcp_timer.c | |
| parent | 5e9b2dbfcbc9b180a0064d8a473a4652ee99c9ad (diff) | |
| download | linux-df19a6267705456f463871ae2aabc44299909d2a.tar.xz | |
tcp: keepalive cleanups
Introduce keepalive_probes(tp) helper, and use it, like
keepalive_time_when(tp) and keepalive_intvl_when(tp)
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 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c index b144a26359bc..c520fb6e06d9 100644 --- a/net/ipv4/tcp_timer.c +++ b/net/ipv4/tcp_timer.c @@ -499,8 +499,7 @@ static void tcp_keepalive_timer (unsigned long data) elapsed = tcp_time_stamp - tp->rcv_tstamp; if (elapsed >= keepalive_time_when(tp)) { - if ((!tp->keepalive_probes && icsk->icsk_probes_out >= sysctl_tcp_keepalive_probes) || - (tp->keepalive_probes && icsk->icsk_probes_out >= tp->keepalive_probes)) { + if (icsk->icsk_probes_out >= keepalive_probes(tp)) { tcp_send_active_reset(sk, GFP_ATOMIC); tcp_write_err(sk); goto out; |