aboutsummaryrefslogtreecommitdiff
path: root/net/mptcp/protocol.c
diff options
context:
space:
mode:
authorGravatar Paolo Abeni <pabeni@redhat.com> 2021-02-11 15:30:42 -0800
committerGravatar David S. Miller <davem@davemloft.net> 2021-02-11 18:30:55 -0800
commitd09d818ec2ed31bce94fdcfcc4700233e01f8498 (patch)
tree9f2d7cd1390816aa185fa6c8e42446c3fa2e117b /net/mptcp/protocol.c
parentmptcp: better msk receive window updates (diff)
downloadlinux-d09d818ec2ed31bce94fdcfcc4700233e01f8498.tar.gz
linux-d09d818ec2ed31bce94fdcfcc4700233e01f8498.tar.bz2
linux-d09d818ec2ed31bce94fdcfcc4700233e01f8498.zip
mptcp: add a missing retransmission timer scheduling
Currently we do not schedule the MPTCP retransmission timer after pushing the data when such action happens in the subflow context. This may cause hang-up on active-backup scenarios, or even when only single subflow msks are involved, if we lost some peer's ack. Fixes: 6e628cd3a8f7 ("mptcp: use mptcp release_cb for delayed tasks") Signed-off-by: Paolo Abeni <pabeni@redhat.com> Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mptcp/protocol.c')
-rw-r--r--net/mptcp/protocol.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 0dbf5cbd7e56..06da6ad31c87 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -1582,6 +1582,9 @@ out:
mptcp_set_timeout(sk, ssk);
tcp_push(ssk, 0, info.mss_now, tcp_sk(ssk)->nonagle,
info.size_goal);
+ if (!mptcp_timer_pending(sk))
+ mptcp_reset_timer(sk);
+
if (msk->snd_data_fin_enable &&
msk->snd_nxt + 1 == msk->write_seq)
mptcp_schedule_work(sk);