aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp_timer.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv4/tcp_timer.c')
-rw-r--r--net/ipv4/tcp_timer.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
index c9a63417af48..6db3124cdbda 100644
--- a/net/ipv4/tcp_timer.c
+++ b/net/ipv4/tcp_timer.c
@@ -249,6 +249,7 @@ void tcp_delack_timer_handler(struct sock *sk)
249 icsk->icsk_ack.pingpong = 0; 249 icsk->icsk_ack.pingpong = 0;
250 icsk->icsk_ack.ato = TCP_ATO_MIN; 250 icsk->icsk_ack.ato = TCP_ATO_MIN;
251 } 251 }
252 tcp_mstamp_refresh(tcp_sk(sk));
252 tcp_send_ack(sk); 253 tcp_send_ack(sk);
253 __NET_INC_STATS(sock_net(sk), LINUX_MIB_DELAYEDACKS); 254 __NET_INC_STATS(sock_net(sk), LINUX_MIB_DELAYEDACKS);
254 } 255 }
@@ -617,6 +618,7 @@ static void tcp_keepalive_timer (struct timer_list *t)
617 goto out; 618 goto out;
618 } 619 }
619 620
621 tcp_mstamp_refresh(tp);
620 if (sk->sk_state == TCP_FIN_WAIT2 && sock_flag(sk, SOCK_DEAD)) { 622 if (sk->sk_state == TCP_FIN_WAIT2 && sock_flag(sk, SOCK_DEAD)) {
621 if (tp->linger2 >= 0) { 623 if (tp->linger2 >= 0) {
622 const int tmo = tcp_fin_time(sk) - TCP_TIMEWAIT_LEN; 624 const int tmo = tcp_fin_time(sk) - TCP_TIMEWAIT_LEN;