Commit ee50e67b authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller

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: ec3edaa7 ("mptcp: Add handling of outgoing MP_JOIN requests")
Acked-by: default avatarPaolo Abeni <pabeni@redhat.com>
Reviewed-by: default avatarMat Martineau <mathew.j.martineau&gt;@linux.intel.com>
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 262ae1f9
...@@ -434,9 +434,10 @@ static void schedule_3rdack_retransmission(struct sock *sk) ...@@ -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 */ /* reschedule with a timeout above RTT, as we must look only for drop */
if (tp->srtt_us) if (tp->srtt_us)
timeout = tp->srtt_us << 1; timeout = usecs_to_jiffies(tp->srtt_us >> (3 - 1));
else else
timeout = TCP_TIMEOUT_INIT; timeout = TCP_TIMEOUT_INIT;
timeout += jiffies;
WARN_ON_ONCE(icsk->icsk_ack.pending & ICSK_ACK_TIMER); WARN_ON_ONCE(icsk->icsk_ack.pending & ICSK_ACK_TIMER);
icsk->icsk_ack.pending |= ICSK_ACK_SCHED | ICSK_ACK_TIMER; icsk->icsk_ack.pending |= ICSK_ACK_SCHED | ICSK_ACK_TIMER;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment