git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From foo@baz Wed Nov 21 12:16:27 CET 2018
   2 From: Stephen Mallon <stephen.mallon@sydney.edu.au>
   3 Date: Tue, 20 Nov 2018 19:15:02 +1100
   4 Subject: tcp: Fix SOF_TIMESTAMPING_RX_HARDWARE to use the latest timestamp during TCP coalescing
   5
   6 From: Stephen Mallon <stephen.mallon@sydney.edu.au>
   7
   8 [ Upstream commit cadf9df27e7cf40e390e060a1c71bb86ecde798b ]
   9
  10 During tcp coalescing ensure that the skb hardware timestamp refers to the
  11 highest sequence number data.
  12 Previously only the software timestamp was updated during coalescing.
  13
  14 Signed-off-by: Stephen Mallon <stephen.mallon@sydney.edu.au>
  15 Signed-off-by: Eric Dumazet <edumazet@google.com>
  16 Signed-off-by: David S. Miller <davem@davemloft.net>
  17 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  18 ---
  19  net/ipv4/tcp_input.c |    1 +
  20  1 file changed, 1 insertion(+)
  21
  22 --- a/net/ipv4/tcp_input.c
  23 +++ b/net/ipv4/tcp_input.c
  24 @@ -4371,6 +4371,7 @@ static bool tcp_try_coalesce(struct sock
  25         if (TCP_SKB_CB(from)->has_rxtstamp) {
  26                 TCP_SKB_CB(to)->has_rxtstamp = true;
  27                 to->tstamp = from->tstamp;
  28 +               skb_hwtstamps(to)->hwtstamp = skb_hwtstamps(from)->hwtstamp;
  29         }
  30
  31         return true;