drop tcp patch from 4.4, 4.9, and 4.14 queues as it breaks the build.

diff --git a/queue-4.14/series b/queue-4.14/series
index fbbdf72e9e74873e58f8e20315f1af22281464a9..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -1 +0,0 @@
-tcp-refine-memory-limit-test-in-tcp_fragment.patch

diff --git a/queue-4.14/tcp-refine-memory-limit-test-in-tcp_fragment.patch b/queue-4.14/tcp-refine-memory-limit-test-in-tcp_fragment.patch
deleted file mode 100644 (file)
index 7021807..0000000
--- a/queue-4.14/tcp-refine-memory-limit-test-in-tcp_fragment.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From b6653b3629e5b88202be3c9abc44713973f5c4b4 Mon Sep 17 00:00:00 2001
-From: Eric Dumazet <edumazet@google.com>
-Date: Fri, 21 Jun 2019 06:09:55 -0700
-Subject: tcp: refine memory limit test in tcp_fragment()
-
-From: Eric Dumazet <edumazet@google.com>
-
-commit b6653b3629e5b88202be3c9abc44713973f5c4b4 upstream.
-
-tcp_fragment() might be called for skbs in the write queue.
-
-Memory limits might have been exceeded because tcp_sendmsg() only
-checks limits at full skb (64KB) boundaries.
-
-Therefore, we need to make sure tcp_fragment() wont punish applications
-that might have setup very low SO_SNDBUF values.
-
-Fixes: f070ef2ac667 ("tcp: tcp_fragment() should apply sane memory limits")
-Signed-off-by: Eric Dumazet <edumazet@google.com>
-Reported-by: Christoph Paasch <cpaasch@apple.com>
-Tested-by: Christoph Paasch <cpaasch@apple.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- net/ipv4/tcp_output.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/net/ipv4/tcp_output.c
-+++ b/net/ipv4/tcp_output.c
-@@ -1274,7 +1274,8 @@ int tcp_fragment(struct sock *sk, struct
-       if (nsize < 0)
-               nsize = 0;
- 
--      if (unlikely((sk->sk_wmem_queued >> 1) > sk->sk_sndbuf)) {
-+      if (unlikely((sk->sk_wmem_queued >> 1) > sk->sk_sndbuf &&
-+                   tcp_queue != TCP_FRAG_IN_WRITE_QUEUE)) {
-               NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPWQUEUETOOBIG);
-               return -ENOMEM;
-       }

diff --git a/queue-4.4/series b/queue-4.4/series
index fbbdf72e9e74873e58f8e20315f1af22281464a9..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -1 +0,0 @@
-tcp-refine-memory-limit-test-in-tcp_fragment.patch

diff --git a/queue-4.4/tcp-refine-memory-limit-test-in-tcp_fragment.patch b/queue-4.4/tcp-refine-memory-limit-test-in-tcp_fragment.patch
deleted file mode 100644 (file)
index 7464b0c..0000000
--- a/queue-4.4/tcp-refine-memory-limit-test-in-tcp_fragment.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From b6653b3629e5b88202be3c9abc44713973f5c4b4 Mon Sep 17 00:00:00 2001
-From: Eric Dumazet <edumazet@google.com>
-Date: Fri, 21 Jun 2019 06:09:55 -0700
-Subject: tcp: refine memory limit test in tcp_fragment()
-
-From: Eric Dumazet <edumazet@google.com>
-
-commit b6653b3629e5b88202be3c9abc44713973f5c4b4 upstream.
-
-tcp_fragment() might be called for skbs in the write queue.
-
-Memory limits might have been exceeded because tcp_sendmsg() only
-checks limits at full skb (64KB) boundaries.
-
-Therefore, we need to make sure tcp_fragment() wont punish applications
-that might have setup very low SO_SNDBUF values.
-
-Fixes: f070ef2ac667 ("tcp: tcp_fragment() should apply sane memory limits")
-Signed-off-by: Eric Dumazet <edumazet@google.com>
-Reported-by: Christoph Paasch <cpaasch@apple.com>
-Tested-by: Christoph Paasch <cpaasch@apple.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- net/ipv4/tcp_output.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/net/ipv4/tcp_output.c
-+++ b/net/ipv4/tcp_output.c
-@@ -1161,7 +1161,8 @@ int tcp_fragment(struct sock *sk, struct
-       if (nsize < 0)
-               nsize = 0;
- 
--      if (unlikely((sk->sk_wmem_queued >> 1) > sk->sk_sndbuf)) {
-+      if (unlikely((sk->sk_wmem_queued >> 1) > sk->sk_sndbuf &&
-+                   tcp_queue != TCP_FRAG_IN_WRITE_QUEUE)) {
-               NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPWQUEUETOOBIG);
-               return -ENOMEM;
-       }

diff --git a/queue-4.9/series b/queue-4.9/series
index fbbdf72e9e74873e58f8e20315f1af22281464a9..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -1 +0,0 @@
-tcp-refine-memory-limit-test-in-tcp_fragment.patch

diff --git a/queue-4.9/tcp-refine-memory-limit-test-in-tcp_fragment.patch b/queue-4.9/tcp-refine-memory-limit-test-in-tcp_fragment.patch
deleted file mode 100644 (file)
index dc70048..0000000
--- a/queue-4.9/tcp-refine-memory-limit-test-in-tcp_fragment.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From b6653b3629e5b88202be3c9abc44713973f5c4b4 Mon Sep 17 00:00:00 2001
-From: Eric Dumazet <edumazet@google.com>
-Date: Fri, 21 Jun 2019 06:09:55 -0700
-Subject: tcp: refine memory limit test in tcp_fragment()
-
-From: Eric Dumazet <edumazet@google.com>
-
-commit b6653b3629e5b88202be3c9abc44713973f5c4b4 upstream.
-
-tcp_fragment() might be called for skbs in the write queue.
-
-Memory limits might have been exceeded because tcp_sendmsg() only
-checks limits at full skb (64KB) boundaries.
-
-Therefore, we need to make sure tcp_fragment() wont punish applications
-that might have setup very low SO_SNDBUF values.
-
-Fixes: f070ef2ac667 ("tcp: tcp_fragment() should apply sane memory limits")
-Signed-off-by: Eric Dumazet <edumazet@google.com>
-Reported-by: Christoph Paasch <cpaasch@apple.com>
-Tested-by: Christoph Paasch <cpaasch@apple.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- net/ipv4/tcp_output.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/net/ipv4/tcp_output.c
-+++ b/net/ipv4/tcp_output.c
-@@ -1185,7 +1185,8 @@ int tcp_fragment(struct sock *sk, struct
-       if (nsize < 0)
-               nsize = 0;
- 
--      if (unlikely((sk->sk_wmem_queued >> 1) > sk->sk_sndbuf)) {
-+      if (unlikely((sk->sk_wmem_queued >> 1) > sk->sk_sndbuf &&
-+                   tcp_queue != TCP_FRAG_IN_WRITE_QUEUE)) {
-               NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPWQUEUETOOBIG);
-               return -ENOMEM;
-       }