diff options
| author | Eric Dumazet <edumazet@google.com> | 2019-06-13 21:22:35 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-06-14 19:51:12 -0700 |
| commit | d6fb396cfaa71afc9f38d573b8ec6409fe3716de (patch) | |
| tree | 81f13c19c7e214129cb08ef7301b4941f435b52f /net/ipv6 | |
| parent | 3e18943333404b03d17fc4a008da7c3676523f05 (diff) | |
| download | linux-stable-d6fb396cfaa71afc9f38d573b8ec6409fe3716de.tar.gz linux-stable-d6fb396cfaa71afc9f38d573b8ec6409fe3716de.tar.bz2 linux-stable-d6fb396cfaa71afc9f38d573b8ec6409fe3716de.zip | |
ipv4: tcp: fix ACK/RST sent with a transmit delay
If we want to set a EDT time for the skb we want to send
via ip_send_unicast_reply(), we have to pass a new parameter
and initialize ipc.sockc.transmit_time with it.
This fixes the EDT time for ACK/RST packets sent on behalf of
a TIME_WAIT socket.
Fixes: a842fe1425cb ("tcp: add optional per socket transmit delay")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/tcp_ipv6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 5606b2131b65..408d9ec26971 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -892,7 +892,7 @@ static void tcp_v6_send_response(const struct sock *sk, struct sk_buff *skb, u32 } else { mark = sk->sk_mark; } - tcp_set_tx_time(buff, sk); + buff->tstamp = tcp_transmit_time(sk); } fl6.flowi6_mark = IP6_REPLY_MARK(net, skb->mark) ?: mark; fl6.fl6_dport = t1->dest; |