On 11/20/2018 12:15 AM, Stephen Mallon wrote:
> During tcp coalescing ensure that the skb hardware timestamp refers to the
> highest sequence number data.
> Previously only the software timestamp was updated during coalescing.
>
> Signed-off-by: Stephen Mallon <stephen.mal...@sydney.edu.au>
> ---
> net/ipv4/tcp_input.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
> index 2868ef28ce52..e695584bb33f 100644
> --- a/net/ipv4/tcp_input.c
> +++ b/net/ipv4/tcp_input.c
> @@ -4363,6 +4363,7 @@ static bool tcp_try_coalesce(struct sock *sk,
> if (TCP_SKB_CB(from)->has_rxtstamp) {
> TCP_SKB_CB(to)->has_rxtstamp = true;
> to->tstamp = from->tstamp;
> + skb_hwtstamps(to)->hwtstamp = skb_hwtstamps(from)->hwtstamp;
> }
>
> return true;
>
SGTM, thanks !
Signed-off-by: Eric Dumazet <eduma...@google.com>