From: Sasha Levin <sashal@kernel.org>
Date: Tue, 20 Aug 2019 03:22:01 +0000 (-0400)
Subject: drop tcp-clear-sk_send_head-after-purging-the-write-queue.patch from 4.14
X-Git-Tag: v4.19.68~33
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9695298ec8023283b4dc365062226f567ff4de71;p=thirdparty%2Fkernel%2Fstable-queue.git

drop tcp-clear-sk_send_head-after-purging-the-write-queue.patch from 4.14

Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/queue-4.14/revert-tcp-clear-sk_send_head-after-purging-the-writ.patch b/queue-4.14/revert-tcp-clear-sk_send_head-after-purging-the-writ.patch
new file mode 100644
index 00000000000..933bddb1af8
--- /dev/null
+++ b/queue-4.14/revert-tcp-clear-sk_send_head-after-purging-the-writ.patch
@@ -0,0 +1,42 @@
+From 647a4a48b0c81e92d5191d476decd962359013f6 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Mon, 19 Aug 2019 23:17:55 -0400
+Subject: 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>
+---
+ include/net/tcp.h | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/include/net/tcp.h b/include/net/tcp.h
+index 9de2c8cdcc512..7994e569644e0 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);
+-- 
+2.20.1
+
diff --git a/queue-4.14/series b/queue-4.14/series
index 4394c4c97e7..331d543c320 100644
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -53,3 +53,4 @@ usb-serial-option-add-support-for-zte-mf871a.patch
 usb-serial-option-add-the-broadmobi-bm818-card.patch
 usb-serial-option-add-motorola-modem-uarts.patch
 bpf-fix-bpf_jit_limit-knob-for-page_size-64k.patch
+revert-tcp-clear-sk_send_head-after-purging-the-writ.patch