diff options
| author | Sasha Levin <sashal@kernel.org> | 2019-08-19 23:17:55 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-25 10:50:23 +0200 |
| commit | 480d6d2f396e76bb9d77a180d32f2308fa8fb2d9 (patch) | |
| tree | 426b7724d0783f8721d2b055604b2316b1f32262 /include | |
| parent | 2d45c6f193789c6b610d734997a2f4cdebec4e37 (diff) | |
| download | linux-stable-480d6d2f396e76bb9d77a180d32f2308fa8fb2d9.tar.gz linux-stable-480d6d2f396e76bb9d77a180d32f2308fa8fb2d9.tar.bz2 linux-stable-480d6d2f396e76bb9d77a180d32f2308fa8fb2d9.zip | |
Revert "tcp: Clear sk_send_head after purging the write queue"
This reverts commit e99e7745d03fc50ba7c5b7c91c17294fee2d5991.
Ben Hutchings writes:
>Sorry, this is the same issue that was already fixed by "tcp: reset
>sk_send_head in tcp_write_queue_purge". You can drop my version from
>the queue for 4.4 and 4.9 and revert it for 4.14.
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/tcp.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index 9de2c8cdcc51..7994e569644e 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -1613,8 +1613,6 @@ static inline void tcp_init_send_head(struct sock *sk) sk->sk_send_head = NULL; } -static inline void tcp_init_send_head(struct sock *sk); - /* write queue abstraction */ static inline void tcp_write_queue_purge(struct sock *sk) { @@ -1623,7 +1621,6 @@ static inline void tcp_write_queue_purge(struct sock *sk) tcp_chrono_stop(sk, TCP_CHRONO_BUSY); while ((skb = __skb_dequeue(&sk->sk_write_queue)) != NULL) sk_wmem_free_skb(sk, skb); - tcp_init_send_head(sk); sk_mem_reclaim(sk); tcp_clear_all_retrans_hints(tcp_sk(sk)); tcp_init_send_head(sk); |