diff options
| author | Paolo Abeni <[email protected]> | 2023-10-10 10:03:04 +0200 |
|---|---|---|
| committer | Paolo Abeni <[email protected]> | 2023-10-10 10:03:05 +0200 |
| commit | c41a38ef3bf78a86f94c3f67a19368a98c10ee2c (patch) | |
| tree | 1008b5a803e12d4077026e516d6f7a75ebfc244d /net/ipv4/tcp.c | |
| parent | 8cea95b0bd7930367f11e2abceda6e096dd18943 (diff) | |
| parent | 939463016b7a869d8b407cfcda4d6545de399698 (diff) | |
Merge branch 'tcp-save-flowlabel-and-use-for-receiver-repathing'
David Morley says:
====================
tcp: save flowlabel and use for receiver repathing
This patch series stores the last received ipv6 flowlabel. This last
received flowlabel is then used to help decide whether a packet is
likely an RTO retransmit or the result of a TLP. This new information
is used to better inform the flowlabel change decision for data
receivers.
====================
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Paolo Abeni <[email protected]>
Diffstat (limited to 'net/ipv4/tcp.c')
| -rw-r--r-- | net/ipv4/tcp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 9a8b134d8ada..faabb5a4a378 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -3756,8 +3756,8 @@ void tcp_get_info(struct sock *sk, struct tcp_info *info) info->tcpi_options |= TCPI_OPT_SYN_DATA; info->tcpi_rto = jiffies_to_usecs(icsk->icsk_rto); - info->tcpi_ato = jiffies_to_usecs(min(icsk->icsk_ack.ato, - tcp_delack_max(sk))); + info->tcpi_ato = jiffies_to_usecs(min_t(u32, icsk->icsk_ack.ato, + tcp_delack_max(sk))); info->tcpi_snd_mss = tp->mss_cache; info->tcpi_rcv_mss = icsk->icsk_ack.rcv_mss; |