mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 06:10:56 +00:00
mptcp: fix delack timer
To compute the rtx timeout schedule_3rdack_retransmission() does multiple
things in the wrong way: srtt_us is measured in usec/8 and the timeout
itself is an absolute value.
Fixes: ec3edaa7ca
("mptcp: Add handling of outgoing MP_JOIN requests")
Acked-by: Paolo Abeni <pabeni@redhat.com>
Reviewed-by: Mat Martineau <mathew.j.martineau>@linux.intel.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
262ae1f9de
commit
ee50e67ba0
1 changed files with 2 additions and 1 deletions
|
@ -434,9 +434,10 @@ static void schedule_3rdack_retransmission(struct sock *sk)
|
|||
|
||||
/* reschedule with a timeout above RTT, as we must look only for drop */
|
||||
if (tp->srtt_us)
|
||||
timeout = tp->srtt_us << 1;
|
||||
timeout = usecs_to_jiffies(tp->srtt_us >> (3 - 1));
|
||||
else
|
||||
timeout = TCP_TIMEOUT_INIT;
|
||||
timeout += jiffies;
|
||||
|
||||
WARN_ON_ONCE(icsk->icsk_ack.pending & ICSK_ACK_TIMER);
|
||||
icsk->icsk_ack.pending |= ICSK_ACK_SCHED | ICSK_ACK_TIMER;
|
||||
|
|
Loading…
Reference in a new issue