diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2018-04-20 12:04:26 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2018-04-20 12:04:26 -0400 |
| commit | cfec36d75b460843403c9e1392fddedf08288c9f (patch) | |
| tree | c2680c2627772aead51327fb3b21bf06ee66f72a /net/ipv4/tcp_timer.c | |
| parent | 3b7c824e9330a640312fce1b04537c684c1d602c (diff) | |
| parent | b22a1fa1b34f17ef3a5cc6007e0705375de3d5dd (diff) | |
Merge remote-tracking branch 'linux-stable/linux-4.15.y' into bcachefs-buffered-io-2
Diffstat (limited to 'net/ipv4/tcp_timer.c')
| -rw-r--r-- | net/ipv4/tcp_timer.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c index 388158c9d9f6..c721140a7d79 100644 --- a/net/ipv4/tcp_timer.c +++ b/net/ipv4/tcp_timer.c @@ -34,6 +34,7 @@ static void tcp_write_err(struct sock *sk) sk->sk_err = sk->sk_err_soft ? : ETIMEDOUT; sk->sk_error_report(sk); + tcp_write_queue_purge(sk); tcp_done(sk); __NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPABORTONTIMEOUT); } |