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/ipv4/ip_output.c | |
| parent | net: remove empty netlink_tap_exit_net (diff) | |
| download | linux-dev-d6fb396cfaa71afc9f38d573b8ec6409fe3716de.tar.xz linux-dev-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/ipv4/ip_output.c')
| -rw-r--r-- | net/ipv4/ip_output.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index f5636ab0b9c3..e0ac39072a9c 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -1632,7 +1632,7 @@ void ip_send_unicast_reply(struct sock *sk, struct sk_buff *skb, const struct ip_options *sopt, __be32 daddr, __be32 saddr, const struct ip_reply_arg *arg, - unsigned int len) + unsigned int len, u64 transmit_time) { struct ip_options_data replyopts; struct ipcm_cookie ipc; @@ -1648,6 +1648,7 @@ void ip_send_unicast_reply(struct sock *sk, struct sk_buff *skb, ipcm_init(&ipc); ipc.addr = daddr; + ipc.sockc.transmit_time = transmit_time; if (replyopts.opt.opt.optlen) { ipc.opt = &replyopts.opt; |