drop tcp patch from everywhere

diff --git a/queue-3.18/series b/queue-3.18/series
index 9fbb673190c3744f65a8e2bf6b944f0f5b03184c..841beaca217c3ef3faff43d752aae30bbac52a48 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -35,4 +35,3 @@ i2c-viperboard-return-message-count-on-master_xfer-success.patch
 arm-davinci-board-dm646x-evm-set-vpif-capture-card-name.patch
 parisc-move-setup_profiling_timer-out-of-init-section.patch
 arm-8753-1-decompressor-add-a-missing-parameter-to-the-addruart-macro.patch
-tcp-do-not-overshoot-window_clamp-in-tcp_rcv_space_adjust.patch

diff --git a/queue-3.18/tcp-do-not-overshoot-window_clamp-in-tcp_rcv_space_adjust.patch b/queue-3.18/tcp-do-not-overshoot-window_clamp-in-tcp_rcv_space_adjust.patch
deleted file mode 100644 (file)
index f86a529..0000000
--- a/queue-3.18/tcp-do-not-overshoot-window_clamp-in-tcp_rcv_space_adjust.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 02db55718d53f9d426cee504c27fb768e9ed4ffe Mon Sep 17 00:00:00 2001
-From: Eric Dumazet <edumazet@google.com>
-Date: Sun, 10 Dec 2017 17:55:02 -0800
-Subject: tcp: do not overshoot window_clamp in tcp_rcv_space_adjust()
-
-From: Eric Dumazet <edumazet@google.com>
-
-commit 02db55718d53f9d426cee504c27fb768e9ed4ffe upstream.
-
-While rcvbuf is properly clamped by tcp_rmem[2], rcvwin
-is left to a potentially too big value.
-
-It has no serious effect, since :
-1) tcp_grow_window() has very strict checks.
-2) window_clamp can be mangled by user space to any value anyway.
-
-tcp_init_buffer_space() and companions use tcp_full_space(),
-we use tcp_win_from_space() to avoid reloading sk->sk_rcvbuf
-
-Signed-off-by: Eric Dumazet <edumazet@google.com>
-Acked-by: Soheil Hassas Yeganeh <soheil@google.com>
-Acked-by: Wei Wang <weiwan@google.com>
-Acked-by: Neal Cardwell <ncardwell@google.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Cc: Benjamin Gilbert <benjamin.gilbert@coreos.com>
-Cc: Guenter Roeck <linux@roeck-us.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- net/ipv4/tcp_input.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/net/ipv4/tcp_input.c
-+++ b/net/ipv4/tcp_input.c
-@@ -605,7 +605,7 @@ void tcp_rcv_space_adjust(struct sock *s
-                       sk->sk_rcvbuf = rcvbuf;
- 
-                       /* Make the window clamp follow along.  */
--                      tp->window_clamp = rcvwin;
-+                      tp->window_clamp = tcp_win_from_space(sk, rcvbuf);
-               }
-       }
-       tp->rcvq_space.space = copied;

diff --git a/queue-4.14/series b/queue-4.14/series
index 9078dbd090b930669cf491fcfcad37670138ad38..6614f203a6df495e8e6300d5d94ec34805b1c310 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -186,4 +186,3 @@ arm-kexec-fix-kdump-register-saving-on-panic.patch
 revert-btrfs-fix-scrub-to-repair-raid6-corruption.patch
 btrfs-fix-scrub-to-repair-raid6-corruption.patch
 btrfs-make-raid6-rebuild-retry-more.patch
-tcp-do-not-overshoot-window_clamp-in-tcp_rcv_space_adjust.patch

diff --git a/queue-4.14/tcp-do-not-overshoot-window_clamp-in-tcp_rcv_space_adjust.patch b/queue-4.14/tcp-do-not-overshoot-window_clamp-in-tcp_rcv_space_adjust.patch
deleted file mode 100644 (file)
index 29fc838..0000000
--- a/queue-4.14/tcp-do-not-overshoot-window_clamp-in-tcp_rcv_space_adjust.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 02db55718d53f9d426cee504c27fb768e9ed4ffe Mon Sep 17 00:00:00 2001
-From: Eric Dumazet <edumazet@google.com>
-Date: Sun, 10 Dec 2017 17:55:02 -0800
-Subject: tcp: do not overshoot window_clamp in tcp_rcv_space_adjust()
-
-From: Eric Dumazet <edumazet@google.com>
-
-commit 02db55718d53f9d426cee504c27fb768e9ed4ffe upstream.
-
-While rcvbuf is properly clamped by tcp_rmem[2], rcvwin
-is left to a potentially too big value.
-
-It has no serious effect, since :
-1) tcp_grow_window() has very strict checks.
-2) window_clamp can be mangled by user space to any value anyway.
-
-tcp_init_buffer_space() and companions use tcp_full_space(),
-we use tcp_win_from_space() to avoid reloading sk->sk_rcvbuf
-
-Signed-off-by: Eric Dumazet <edumazet@google.com>
-Acked-by: Soheil Hassas Yeganeh <soheil@google.com>
-Acked-by: Wei Wang <weiwan@google.com>
-Acked-by: Neal Cardwell <ncardwell@google.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Cc: Benjamin Gilbert <benjamin.gilbert@coreos.com>
-Cc: Guenter Roeck <linux@roeck-us.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- net/ipv4/tcp_input.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/net/ipv4/tcp_input.c
-+++ b/net/ipv4/tcp_input.c
-@@ -647,7 +647,7 @@ void tcp_rcv_space_adjust(struct sock *s
-                       sk->sk_rcvbuf = rcvbuf;
- 
-                       /* Make the window clamp follow along.  */
--                      tp->window_clamp = rcvwin;
-+                      tp->window_clamp = tcp_win_from_space(sk, rcvbuf);
-               }
-       }
-       tp->rcvq_space.space = copied;

diff --git a/queue-4.4/series b/queue-4.4/series
index c6a4537cbe4f4745ec9ae5dad39851747cc512bf..c564da0a4603986ff07b82707baa42db61a586ac 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -5,5 +5,4 @@ atm-zatm-fix-memcmp-casting.patch
 net-qmi_wwan-add-netgear-aircard-779s.patch
 net-sonic-use-dma_mapping_error.patch
 revert-btrfs-fix-scrub-to-repair-raid6-corruption.patch
-tcp-do-not-overshoot-window_clamp-in-tcp_rcv_space_adjust.patch
 btrfs-make-raid6-rebuild-retry-more.patch

diff --git a/queue-4.4/tcp-do-not-overshoot-window_clamp-in-tcp_rcv_space_adjust.patch b/queue-4.4/tcp-do-not-overshoot-window_clamp-in-tcp_rcv_space_adjust.patch
deleted file mode 100644 (file)
index 9ad814c..0000000
--- a/queue-4.4/tcp-do-not-overshoot-window_clamp-in-tcp_rcv_space_adjust.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 02db55718d53f9d426cee504c27fb768e9ed4ffe Mon Sep 17 00:00:00 2001
-From: Eric Dumazet <edumazet@google.com>
-Date: Sun, 10 Dec 2017 17:55:02 -0800
-Subject: tcp: do not overshoot window_clamp in tcp_rcv_space_adjust()
-
-From: Eric Dumazet <edumazet@google.com>
-
-commit 02db55718d53f9d426cee504c27fb768e9ed4ffe upstream.
-
-While rcvbuf is properly clamped by tcp_rmem[2], rcvwin
-is left to a potentially too big value.
-
-It has no serious effect, since :
-1) tcp_grow_window() has very strict checks.
-2) window_clamp can be mangled by user space to any value anyway.
-
-tcp_init_buffer_space() and companions use tcp_full_space(),
-we use tcp_win_from_space() to avoid reloading sk->sk_rcvbuf
-
-Signed-off-by: Eric Dumazet <edumazet@google.com>
-Acked-by: Soheil Hassas Yeganeh <soheil@google.com>
-Acked-by: Wei Wang <weiwan@google.com>
-Acked-by: Neal Cardwell <ncardwell@google.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Cc: Benjamin Gilbert <benjamin.gilbert@coreos.com>
-Cc: Guenter Roeck <linux@roeck-us.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- net/ipv4/tcp_input.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/net/ipv4/tcp_input.c
-+++ b/net/ipv4/tcp_input.c
-@@ -612,7 +612,7 @@ void tcp_rcv_space_adjust(struct sock *s
-                       sk->sk_rcvbuf = rcvbuf;
- 
-                       /* Make the window clamp follow along.  */
--                      tp->window_clamp = rcvwin;
-+                      tp->window_clamp = tcp_win_from_space(sk, rcvbuf);
-               }
-       }
-       tp->rcvq_space.space = copied;

diff --git a/queue-4.9/series b/queue-4.9/series
index ab380667a0809cf46cd6e48e5831f4cb4b0c20e5..de87abba64c23010dca28cb03c3824d32b7d6a50 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -9,5 +9,4 @@ platform-x86-asus-wmi-fix-null-pointer-dereference.patch
 net-sonic-use-dma_mapping_error.patch
 net-dsa-b53-add-bcm5389-support.patch
 revert-btrfs-fix-scrub-to-repair-raid6-corruption.patch
-tcp-do-not-overshoot-window_clamp-in-tcp_rcv_space_adjust.patch
 btrfs-make-raid6-rebuild-retry-more.patch

diff --git a/queue-4.9/tcp-do-not-overshoot-window_clamp-in-tcp_rcv_space_adjust.patch b/queue-4.9/tcp-do-not-overshoot-window_clamp-in-tcp_rcv_space_adjust.patch
deleted file mode 100644 (file)
index 4acddbf..0000000
--- a/queue-4.9/tcp-do-not-overshoot-window_clamp-in-tcp_rcv_space_adjust.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 02db55718d53f9d426cee504c27fb768e9ed4ffe Mon Sep 17 00:00:00 2001
-From: Eric Dumazet <edumazet@google.com>
-Date: Sun, 10 Dec 2017 17:55:02 -0800
-Subject: tcp: do not overshoot window_clamp in tcp_rcv_space_adjust()
-
-From: Eric Dumazet <edumazet@google.com>
-
-commit 02db55718d53f9d426cee504c27fb768e9ed4ffe upstream.
-
-While rcvbuf is properly clamped by tcp_rmem[2], rcvwin
-is left to a potentially too big value.
-
-It has no serious effect, since :
-1) tcp_grow_window() has very strict checks.
-2) window_clamp can be mangled by user space to any value anyway.
-
-tcp_init_buffer_space() and companions use tcp_full_space(),
-we use tcp_win_from_space() to avoid reloading sk->sk_rcvbuf
-
-Signed-off-by: Eric Dumazet <edumazet@google.com>
-Acked-by: Soheil Hassas Yeganeh <soheil@google.com>
-Acked-by: Wei Wang <weiwan@google.com>
-Acked-by: Neal Cardwell <ncardwell@google.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Cc: Benjamin Gilbert <benjamin.gilbert@coreos.com>
-Cc: Guenter Roeck <linux@roeck-us.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- net/ipv4/tcp_input.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/net/ipv4/tcp_input.c
-+++ b/net/ipv4/tcp_input.c
-@@ -636,7 +636,7 @@ void tcp_rcv_space_adjust(struct sock *s
-                       sk->sk_rcvbuf = rcvbuf;
- 
-                       /* Make the window clamp follow along.  */
--                      tp->window_clamp = rcvwin;
-+                      tp->window_clamp = tcp_win_from_space(sk, rcvbuf);
-               }
-       }
-       tp->rcvq_space.space = copied;