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/dccp/timer.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/dccp/timer.c')
| -rw-r--r-- | net/dccp/timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/dccp/timer.c b/net/dccp/timer.c index b3255e87cc7e..a4cfb47b60e5 100644 --- a/net/dccp/timer.c +++ b/net/dccp/timer.c @@ -196,8 +196,8 @@ static void dccp_delack_timer(struct timer_list *t) 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. |