summaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp.c
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2019-01-17 11:23:36 -0800
committerDavid S. Miller <davem@davemloft.net>2019-01-17 22:19:05 -0800
commitb9e2e689aab293c3da0ceac0921449a07b692f1f (patch)
tree92bb8c1efe8799d3057f35b2ba73d53cef0f5d67 /net/ipv4/tcp.c
parenta0070e463f3fb303b64dea60fe2b0a2e60fce61c (diff)
downloadlinux-b9e2e689aab293c3da0ceac0921449a07b692f1f.tar.gz
linux-b9e2e689aab293c3da0ceac0921449a07b692f1f.tar.bz2
linux-b9e2e689aab293c3da0ceac0921449a07b692f1f.zip
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: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp.c')
-rw-r--r--net/ipv4/tcp.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 9d8131f95a97..731b1c6e88a9 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -2572,6 +2572,7 @@ int tcp_disconnect(struct sock *sk, int flags)
sk->sk_shutdown = 0;
sock_reset_flag(sk, SOCK_DONE);
tp->srtt_us = 0;
+ tp->mdev_us = jiffies_to_usecs(TCP_TIMEOUT_INIT);
tp->rcv_rtt_last_tsecr = 0;
tp->write_seq += tp->max_window + 2;
if (tp->write_seq == 0)