mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 05:44:11 +00:00
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: 724b00c129
("mptcp: refine opt_mp_capable determination")
Reviewed-by: Matthieu Baerts <matttbe@kernel.org>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
c2945c435c
commit
c0f5aec28e
1 changed files with 2 additions and 1 deletions
|
@ -783,7 +783,8 @@ static struct sock *subflow_syn_recv_sock(const struct sock *sk,
|
||||||
* options.
|
* options.
|
||||||
*/
|
*/
|
||||||
mptcp_get_options(skb, &mp_opt);
|
mptcp_get_options(skb, &mp_opt);
|
||||||
if (!(mp_opt.suboptions & OPTION_MPTCP_MPC_ACK))
|
if (!(mp_opt.suboptions &
|
||||||
|
(OPTION_MPTCP_MPC_SYN | OPTION_MPTCP_MPC_ACK)))
|
||||||
fallback = true;
|
fallback = true;
|
||||||
|
|
||||||
} else if (subflow_req->mp_join) {
|
} else if (subflow_req->mp_join) {
|
||||||
|
|
Loading…
Reference in a new issue