1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00

mptcp: add the fallback check

This patch adds the fallback check in subflow_check_data_avail(). Only
do the fallback when the msk hasn't fallen back yet.

Suggested-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Geliang Tang 2022-04-22 14:55:37 -07:00 committed by David S. Miller
parent 1761fed256
commit 0348c690ed

View file

@ -1203,6 +1203,7 @@ no_data:
return false; return false;
fallback: fallback:
if (!__mptcp_check_fallback(msk)) {
/* RFC 8684 section 3.7. */ /* RFC 8684 section 3.7. */
if (subflow->send_mp_fail) { if (subflow->send_mp_fail) {
if (mptcp_has_another_subflow(ssk)) { if (mptcp_has_another_subflow(ssk)) {
@ -1232,6 +1233,8 @@ fallback:
} }
__mptcp_do_fallback(msk); __mptcp_do_fallback(msk);
}
skb = skb_peek(&ssk->sk_receive_queue); skb = skb_peek(&ssk->sk_receive_queue);
subflow->map_valid = 1; subflow->map_valid = 1;
subflow->map_seq = READ_ONCE(msk->ack_seq); subflow->map_seq = READ_ONCE(msk->ack_seq);