Skip to content

Commit c0f5aec

Browse files
Paolo Abenidavem330
authored andcommitted
mptcp: relax check on MPC passive fallback
While testing the blamed commit below, I was able to miss (!) packetdrill failures in the fastopen test-cases. On passive fastopen the child socket is created by incoming TCP MPC syn, allow for both MPC_SYN and MPC_ACK header. Fixes: 724b00c ("mptcp: refine opt_mp_capable determination") Reviewed-by: Matthieu Baerts <[email protected]> Signed-off-by: Paolo Abeni <[email protected]> Reviewed-by: Eric Dumazet <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent c2945c4 commit c0f5aec

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

net/mptcp/subflow.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -783,7 +783,8 @@ static struct sock *subflow_syn_recv_sock(const struct sock *sk,
783783
* options.
784784
*/
785785
mptcp_get_options(skb, &mp_opt);
786-
if (!(mp_opt.suboptions & OPTION_MPTCP_MPC_ACK))
786+
if (!(mp_opt.suboptions &
787+
(OPTION_MPTCP_MPC_SYN | OPTION_MPTCP_MPC_ACK)))
787788
fallback = true;
788789

789790
} else if (subflow_req->mp_join) {

0 commit comments

Comments
 (0)