Re: [PATCH net-next 2/7] tcp: track min RTT using windowed min-filter

On Sun, Oct 18, 2015 at 10:33:41AM -0400, Neal Cardwell wrote:

On Wed, Oct 14, 2015 at 5:28 AM, Andrew Shewmaker [off-list ref] wrote:

quoted

quoted

diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 38743e5..e177386 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c

...

quoted

@@ -2961,7 +3028,7 @@ void tcp_synack_rtt_meas(struct sock *sk, struct request_sock *req)
              rtt_us = skb_mstamp_us_delta(&now, &tcp_rsk(req)->snt_synack);
      }

-     tcp_ack_update_rtt(sk, FLAG_SYN_ACKED, rtt_us, -1L);
+     tcp_ack_update_rtt(sk, FLAG_SYN_ACKED, rtt_us, -1L, rtt_us);
 }

This didn't apply to net-next for me. I see seq_rtt_us instead of
rtt_us and a check on the existence of tp->srtt_us. Maybe I've
misapplied the patch?

This patch series applies cleanly for me against David Miller's
net-next at SHA1 4be3158 (from Friday Oct 16). (Using "git am" on the
mbox patches from http://patchwork.ozlabs.org/project/netdev/list/
...)

On top of what SHA1 are you applying the series?

Doesn't matter which one ... it was the wrong one :)

I'd executed a git pull before applying the patch set, but I ended up having to
force it. Once I did, it applied cleanly.

Apologies for the false alarm,

Andrew