Skip to content

Commit

Permalink
Paolo's fix
Browse files Browse the repository at this point in the history
  • Loading branch information
cpaasch committed Apr 17, 2024
1 parent 14566b1 commit c4965fb
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion net/mptcp/protocol.c
Original file line number Diff line number Diff line change
Expand Up @@ -1002,8 +1002,14 @@ static void __mptcp_clean_una(struct sock *sk)

if (unlikely(dfrag == msk->first_pending)) {
/* in recovery mode can see ack after the current snd head */
if (WARN_ON_ONCE(!msk->recovery))
if (WARN_ON_ONCE(!msk->recovery)) {
pr_err("sk state %d:%d snd_una %llx write_seq %llx dfrag end seq %llx frag len %d bytes sent %lld acked %lld",
sk->sk_state, msk->first ? msk->first->sk_state: -1, msk->write_seq,
msk->snd_una, dfrag->data_seq + dfrag->data_len, dfrag->data_len,
msk->bytes_sent, msk->bytes_acked);

break;
}

WRITE_ONCE(msk->first_pending, mptcp_send_next(sk));
}
Expand Down Expand Up @@ -3730,6 +3736,9 @@ static int mptcp_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_TOKENFALLBACKINIT);
mptcp_subflow_early_fallback(msk, subflow);
}

WRITE_ONCE(msk->write_seq, subflow->idsn);
WRITE_ONCE(msk->snd_nxt, subflow->idsn);
if (likely(!__mptcp_check_fallback(msk)))
MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPCAPABLEACTIVE);

Expand Down

0 comments on commit c4965fb

Please sign in to comment.