Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f7be91e authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "tcp: Clear sack info on purge"

parents 6382c588 ff8ce518

include/linux/tcp.h

+2 −1
Original line number Diff line number Diff line
@@ -232,7 +232,8 @@ struct tcp_sock { 
		fastopen_connect:1, /* FASTOPEN_CONNECT sockopt */

		fastopen_no_cookie:1, /* Allow send/recv SYN+data without a cookie */

		is_sack_reneg:1,    /* in recovery from loss with SACK reneg? */

		unused:2;

		unused:1,

		wqp_called:1;

	u8	nonagle     : 4,/* Disable Nagle algorithm?             */

		thin_lto    : 1,/* Use linear timeouts for thin streams */

		recvmsg_inq : 1,/* Indicate # of bytes in queue upon recvmsg */

net/ipv4/tcp.c

+3 −0
Original line number Diff line number Diff line
@@ -2534,6 +2534,9 @@ void tcp_write_queue_purge(struct sock *sk) 
	INIT_LIST_HEAD(&tcp_sk(sk)->tsorted_sent_queue);

	sk_mem_reclaim(sk);

	tcp_clear_all_retrans_hints(tcp_sk(sk));

	tcp_sk(sk)->highest_sack = NULL;

	tcp_sk(sk)->sacked_out = 0;

	tcp_sk(sk)->wqp_called = 1;

	tcp_sk(sk)->packets_out = 0;

	inet_csk(sk)->icsk_backoff = 0;

}