drop tcp patch that was already in the last released kernels.

diff --git a/queue-4.14/series b/queue-4.14/series
index c73ec08eb1dcf33a837096fb8285761da41ca7b4..3fe3123e809368e08125ab0bfd2bbb5acc2d91e3 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -5,4 +5,3 @@ revert-x86-uaccess-ftrace-fix-ftrace_likely_update-v.patch
 ib-hfi1-close-psm-sdma_progress-sleep-window.patch
 block-add-a-lower-level-bio_add_page-interface.patch
 block-bio_iov_iter_get_pages-pin-more-pages-for-mult.patch
-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 0b659ac..0000000
--- a/queue-4.14/tcp-refine-memory-limit-test-in-tcp_fragment.patch
+++ /dev/null
@@ -1,39 +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 |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/net/ipv4/tcp_output.c
-+++ b/net/ipv4/tcp_output.c
-@@ -1274,7 +1274,7 @@ 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 + 0x20000)) {
-               NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPWQUEUETOOBIG);
-               return -ENOMEM;
-       }

diff --git a/queue-4.4/series b/queue-4.4/series
index 8361a26d73987e391b03edec5818877e1cc6f3be..81d6829c903ac561e56ceba33e3f1fac221bfeda 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -25,4 +25,3 @@ cfg80211-fix-memory-leak-of-wiphy-device-name.patch
 mac80211-drop-robust-management-frames-from-unknown-ta.patch
 perf-ui-helpline-use-strlcpy-as-a-shorter-form-of-strncpy-explicit-set-nul.patch
 perf-help-remove-needless-use-of-strncpy.patch
-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 472cbea..0000000
--- a/queue-4.4/tcp-refine-memory-limit-test-in-tcp_fragment.patch
+++ /dev/null
@@ -1,39 +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 |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/net/ipv4/tcp_output.c
-+++ b/net/ipv4/tcp_output.c
-@@ -1161,7 +1161,7 @@ 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 + 0x20000)) {
-               NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPWQUEUETOOBIG);
-               return -ENOMEM;
-       }

diff --git a/queue-4.9/series b/queue-4.9/series
index c916e720b1fcff2c385b8382fdc5a98dc3f842a8..ecda3b9cdcbf8d04cbc75801ab210b297f1201ae 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -37,4 +37,3 @@ ib-hfi1-avoid-hardlockup-with-flushlist_lock.patch
 perf-ui-helpline-use-strlcpy-as-a-shorter-form-of-strncpy-explicit-set-nul.patch
 perf-help-remove-needless-use-of-strncpy.patch
 perf-header-fix-unchecked-usage-of-strncpy.patch
-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 317c67e..0000000
--- a/queue-4.9/tcp-refine-memory-limit-test-in-tcp_fragment.patch
+++ /dev/null
@@ -1,39 +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 |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/net/ipv4/tcp_output.c
-+++ b/net/ipv4/tcp_output.c
-@@ -1185,7 +1185,7 @@ 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 + 0x20000)) {
-               NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPWQUEUETOOBIG);
-               return -ENOMEM;
-       }