On Wed, Oct 14, 2015 at 5:28 AM, Andrew Shewmaker <ags...@gmail.com> wrote: >> 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 > ... >> @@ -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? neal -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
