Commit b9e2e689 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller

tcp: move mdev_us init to tcp_disconnect()

If we make sure a listener always has its mdev_us
field set to TCP_TIMEOUT_INIT, we do not need to rewrite
this field after a new clone is created.

tcp_disconnect() is very seldom used in real applications.
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a0070e46
...@@ -2572,6 +2572,7 @@ int tcp_disconnect(struct sock *sk, int flags) ...@@ -2572,6 +2572,7 @@ int tcp_disconnect(struct sock *sk, int flags)
sk->sk_shutdown = 0; sk->sk_shutdown = 0;
sock_reset_flag(sk, SOCK_DONE); sock_reset_flag(sk, SOCK_DONE);
tp->srtt_us = 0; tp->srtt_us = 0;
tp->mdev_us = jiffies_to_usecs(TCP_TIMEOUT_INIT);
tp->rcv_rtt_last_tsecr = 0; tp->rcv_rtt_last_tsecr = 0;
tp->write_seq += tp->max_window + 2; tp->write_seq += tp->max_window + 2;
if (tp->write_seq == 0) if (tp->write_seq == 0)
......
...@@ -479,7 +479,6 @@ struct sock *tcp_create_openreq_child(const struct sock *sk, ...@@ -479,7 +479,6 @@ struct sock *tcp_create_openreq_child(const struct sock *sk,
tcp_init_wl(newtp, treq->rcv_isn); tcp_init_wl(newtp, treq->rcv_isn);
newtp->mdev_us = jiffies_to_usecs(TCP_TIMEOUT_INIT);
minmax_reset(&newtp->rtt_min, tcp_jiffies32, ~0U); minmax_reset(&newtp->rtt_min, tcp_jiffies32, ~0U);
newicsk->icsk_ack.lrcvtime = tcp_jiffies32; newicsk->icsk_ack.lrcvtime = tcp_jiffies32;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment