Commit cadf9df2 authored Nov 20, 2018 by Stephen Mallon Committed by David S. Miller Nov 20, 2018

tcp: Fix SOF_TIMESTAMPING_RX_HARDWARE to use the latest timestamp during TCP coalescing



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.mallon@sydney.edu.au>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 59663e42

net/ipv4/tcp_input.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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;