diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-04 11:21:03 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-04 11:21:03 -0400 |
| commit | b5c56d866cdde359fa8af0c7fa62e403a4f59689 (patch) | |
| tree | 1265c69bf1b30ca8901479e0f2ae93fa1501f773 | |
| parent | 92d0e5bac69892047b206875192721f2681668ae (diff) | |
| download | longterm-queue-4.12-b5c56d866cdde359fa8af0c7fa62e403a4f59689.tar.gz | |
tcp: drop time patch - fcn not present in 4.12
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/series | 1 | ||||
| -rw-r--r-- | queue/tcp-use-current-time-in-tcp_rcv_space_adjust.patch | 35 |
2 files changed, 0 insertions, 36 deletions
diff --git a/queue/series b/queue/series index e2609bd..520d57e 100644 --- a/queue/series +++ b/queue/series @@ -119,7 +119,6 @@ sit-update-frag_off-info.patch stmmac-reset-last-TSO-segment-size-after-device-open.patch tcp-dccp-block-bh-before-arming-time_wait-timer.patch tcp-remove-buggy-call-to-tcp_v6_restore_cb.patch -tcp-use-current-time-in-tcp_rcv_space_adjust.patch tipc-call-tipc_rcv-only-if-bearer-is-up-in-tipc_udp_.patch tipc-fix-memory-leak-in-tipc_accept_from_sock.patch tun-free-skb-in-early-errors.patch diff --git a/queue/tcp-use-current-time-in-tcp_rcv_space_adjust.patch b/queue/tcp-use-current-time-in-tcp_rcv_space_adjust.patch deleted file mode 100644 index 56b626b..0000000 --- a/queue/tcp-use-current-time-in-tcp_rcv_space_adjust.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 8632385022f2b05a6ca0b9e0f95575865de0e2ce Mon Sep 17 00:00:00 2001 -From: Eric Dumazet <edumazet@google.com> -Date: Wed, 6 Dec 2017 11:08:19 -0800 -Subject: [PATCH] tcp: use current time in tcp_rcv_space_adjust() - -commit 8632385022f2b05a6ca0b9e0f95575865de0e2ce upstream. - -When I switched rcv_rtt_est to high resolution timestamps, I forgot -that tp->tcp_mstamp needed to be refreshed in tcp_rcv_space_adjust() - -Using an old timestamp leads to autotuning lags. - -Fixes: 645f4c6f2ebd ("tcp: switch rcv_rtt_est and rcvq_space to high resolution timestamps") -Signed-off-by: Eric Dumazet <edumazet@google.com> -Cc: Wei Wang <weiwan@google.com> -Cc: Neal Cardwell <ncardwell@google.com> -Cc: Yuchung Cheng <ycheng@google.com> -Acked-by: Neal Cardwell <ncardwell@google.com> -Signed-off-by: David S. Miller <davem@davemloft.net> - -diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c -index 734cfc8ff76e..514c00732988 100644 ---- a/net/ipv4/tcp_input.c -+++ b/net/ipv4/tcp_input.c -@@ -579,6 +579,7 @@ void tcp_rcv_space_adjust(struct sock *sk) - int time; - int copied; - -+ tcp_mstamp_refresh(tp); - time = tcp_stamp_us_delta(tp->tcp_mstamp, tp->rcvq_space.time); - if (time < (tp->rcv_rtt_est.rtt_us >> 3) || tp->rcv_rtt_est.rtt_us == 0) - return; --- -2.15.0 - |