Commit 860975c6 authored by Florian Westphal's avatar Florian Westphal Committed by Jakub Kicinski

mptcp: skip to next candidate if subflow has unacked data

In case a subflow path is blocked, MPTCP-level retransmit may not take
place anymore because such subflow is likely to have unacked data left
in its write queue.

Ignore subflows that have experienced loss and test next candidate.

Fixes: 3b1d6210 ("mptcp: implement and use MPTCP-level retransmission")
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 26aa2314
...@@ -1726,8 +1726,11 @@ static struct sock *mptcp_subflow_get_retrans(const struct mptcp_sock *msk) ...@@ -1726,8 +1726,11 @@ static struct sock *mptcp_subflow_get_retrans(const struct mptcp_sock *msk)
continue; continue;
/* still data outstanding at TCP level? Don't retransmit. */ /* still data outstanding at TCP level? Don't retransmit. */
if (!tcp_write_queue_empty(ssk)) if (!tcp_write_queue_empty(ssk)) {
if (inet_csk(ssk)->icsk_ca_state >= TCP_CA_Loss)
continue;
return NULL; return NULL;
}
if (subflow->backup) { if (subflow->backup) {
if (!backup) if (!backup)
......
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