diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-24 15:06:55 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-24 15:06:55 -0400 |
| commit | 2a6b83b1d73ed1f9310c1747f69d82c672756d76 (patch) | |
| tree | 36c1ca3fbfe03d843fa073aa63f005e6ec19a003 | |
| parent | 24346f1620d4983ab97aefbb718922033b3805ca (diff) | |
| download | longterm-queue-4.12-2a6b83b1d73ed1f9310c1747f69d82c672756d76.tar.gz | |
tcp: drop patch n/a for 4.12
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/series | 1 | ||||
| -rw-r--r-- | queue/tcp-fix-potential-underestimation-on-rcv_rtt.patch | 57 |
2 files changed, 0 insertions, 58 deletions
diff --git a/queue/series b/queue/series index 3de3ca8..bd4dc70 100644 --- a/queue/series +++ b/queue/series @@ -55,7 +55,6 @@ s390-qeth-fix-error-handling-in-checksum-cmd-callbac.patch sctp-make-sure-stream-nums-can-match-optlen-in-sctp_.patch tipc-fix-hanging-poll-for-stream-sockets.patch mlxsw-spectrum-Disable-MAC-learning-for-ovs-port.patch -tcp-fix-potential-underestimation-on-rcv_rtt.patch net-phy-marvell-Limit-88m1101-autoneg-errata-to-88E1.patch bnxt_en-Fix-sources-of-spurious-netpoll-warnings.patch usbip-fix-usbip-bind-writing-random-string-after-com.patch diff --git a/queue/tcp-fix-potential-underestimation-on-rcv_rtt.patch b/queue/tcp-fix-potential-underestimation-on-rcv_rtt.patch deleted file mode 100644 index d388eb7..0000000 --- a/queue/tcp-fix-potential-underestimation-on-rcv_rtt.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 9ee11bd03cb1a5c3ca33c2bb70e7ed325f68890f Mon Sep 17 00:00:00 2001 -From: Wei Wang <weiwan@google.com> -Date: Tue, 12 Dec 2017 16:28:58 -0800 -Subject: [PATCH] tcp: fix potential underestimation on rcv_rtt - -commit 9ee11bd03cb1a5c3ca33c2bb70e7ed325f68890f upstream. - -When ms timestamp is used, current logic uses 1us in -tcp_rcv_rtt_update() when the real rcv_rtt is within 1 - 999us. -This could cause rcv_rtt underestimation. -Fix it by always using a min value of 1ms if ms timestamp is used. - -Fixes: 645f4c6f2ebd ("tcp: switch rcv_rtt_est and rcvq_space to high resolution timestamps") -Signed-off-by: Wei Wang <weiwan@google.com> -Signed-off-by: Eric Dumazet <edumazet@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 9550cc42de2d..45f750e85714 100644 ---- a/net/ipv4/tcp_input.c -+++ b/net/ipv4/tcp_input.c -@@ -508,9 +508,6 @@ static void tcp_rcv_rtt_update(struct tcp_sock *tp, u32 sample, int win_dep) - u32 new_sample = tp->rcv_rtt_est.rtt_us; - long m = sample; - -- if (m == 0) -- m = 1; -- - if (new_sample != 0) { - /* If we sample in larger samples in the non-timestamp - * case, we could grossly overestimate the RTT especially -@@ -547,6 +544,8 @@ static inline void tcp_rcv_rtt_measure(struct tcp_sock *tp) - if (before(tp->rcv_nxt, tp->rcv_rtt_est.seq)) - return; - delta_us = tcp_stamp_us_delta(tp->tcp_mstamp, tp->rcv_rtt_est.time); -+ if (!delta_us) -+ delta_us = 1; - tcp_rcv_rtt_update(tp, delta_us, 1); - - new_measure: -@@ -563,8 +562,11 @@ static inline void tcp_rcv_rtt_measure_ts(struct sock *sk, - (TCP_SKB_CB(skb)->end_seq - - TCP_SKB_CB(skb)->seq >= inet_csk(sk)->icsk_ack.rcv_mss)) { - u32 delta = tcp_time_stamp(tp) - tp->rx_opt.rcv_tsecr; -- u32 delta_us = delta * (USEC_PER_SEC / TCP_TS_HZ); -+ u32 delta_us; - -+ if (!delta) -+ delta = 1; -+ delta_us = delta * (USEC_PER_SEC / TCP_TS_HZ); - tcp_rcv_rtt_update(tp, delta_us, 0); - } - } --- -2.15.0 - |