diff options
| author |   Stephen Mallon <stephen.mallon@sydney.edu.au> | 2018-11-20 19:15:02 +1100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-11-20 10:32:11 -0800 |
| commit | cadf9df27e7cf40e390e060a1c71bb86ecde798b (patch) | |
| tree | 00e376aa0bc788a78b3c12242d914c0aeeccea8f | |
| parent | tg3: Add PHY reset for 5717/5719/5720 in change ring and flow control paths (diff) | |
| download | linux-dev-cadf9df27e7cf40e390e060a1c71bb86ecde798b.tar.xz linux-dev-cadf9df27e7cf40e390e060a1c71bb86ecde798b.zip | |
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>
| -rw-r--r-- | net/ipv4/tcp_input.c | 1 |
1 files changed, 1 insertions, 0 deletions
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; |