From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Mallon Subject: [PATCH net] tcp: Fix SOF_TIMESTAMPING_RX_HARDWARE to use the latest timestamp during TCP coalescing Date: Tue, 20 Nov 2018 19:15:02 +1100 Message-ID: <20181120081502.GA9134@stephen-mallon> Mime-Version: 1.0 Content-Type: text/plain; charset=WINDOWS-1252 Content-Transfer-Encoding: quoted-printable Cc: "David S. Miller" , , To: Eric Dumazet Return-path: Received: from au-smtp-delivery-110.mimecast.com ([180.189.28.110]:34555 "EHLO au-smtp-delivery-110.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726116AbeKTStH (ORCPT ); Tue, 20 Nov 2018 13:49:07 -0500 Content-Disposition: inline Sender: netdev-owner@vger.kernel.org List-ID: 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 --- 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, =09if (TCP_SKB_CB(from)->has_rxtstamp) { =09=09TCP_SKB_CB(to)->has_rxtstamp =3D true; =09=09to->tstamp =3D from->tstamp; +=09=09skb_hwtstamps(to)->hwtstamp =3D skb_hwtstamps(from)->hwtstamp; =09} =20 =09return true; --=20 2.18.1