diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2023-10-10 11:03:04 +0300 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2023-10-10 11:03:05 +0300 |
| commit | c41a38ef3bf78a86f94c3f67a19368a98c10ee2c (patch) | |
| tree | 1008b5a803e12d4077026e516d6f7a75ebfc244d /net/ipv4/tcp_timer.c | |
| parent | 8cea95b0bd7930367f11e2abceda6e096dd18943 (diff) | |
| parent | 939463016b7a869d8b407cfcda4d6545de399698 (diff) | |
| download | linux-c41a38ef3bf78a86f94c3f67a19368a98c10ee2c.tar.xz | |
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/20231006011841.3558307-1-morleyd.kernel@gmail.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'net/ipv4/tcp_timer.c')
| -rw-r--r-- | net/ipv4/tcp_timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c index 3f61c6a70a1f..0862b73dd3b5 100644 --- a/net/ipv4/tcp_timer.c +++ b/net/ipv4/tcp_timer.c @@ -322,7 +322,7 @@ void tcp_delack_timer_handler(struct sock *sk) if (inet_csk_ack_scheduled(sk)) { if (!inet_csk_in_pingpong_mode(sk)) { /* Delayed ACK missed: inflate ATO. */ - icsk->icsk_ack.ato = min(icsk->icsk_ack.ato << 1, icsk->icsk_rto); + icsk->icsk_ack.ato = min_t(u32, icsk->icsk_ack.ato << 1, icsk->icsk_rto); } else { /* Delayed ACK missed: leave pingpong mode and * deflate ATO. |