Skip to content

mptcp: fix recent failed backports

Matthieu Baerts (NGI0) mptcp stable 1 version Applied

Status from this message: This is a note to let you know that I've just added the patch titled

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest3 patches 4 repliesApplied

Patches in v1 Applied

#Subject and filesSizeRepliesApplied
1/3mptcp: track and update contiguous data statusnet/mptcp/protocol.c net/mptcp/protocol.h net/mptcp/subflow.c+7 -11 reply
2/3mptcp: handle consistently DSS corruptionnet/mptcp/mib.c net/mptcp/mib.h net/mptcp/protocol.c +1 more+22 -41 reply
3/3tcp: fix mptcp DSS corruption due to large pmtu xmitnet/ipv4/tcp_output.c+1 -11 reply

Reviews trailers per patch

2 of 3 patches have a Reviewed-by or Acked-by.

PatchMatthieu Baerts (NGI0)
1/3
2/3R-b R-b
3/3A-b A-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [PATCH 5.10.y 0/3] mptcp: fix recent failed backports

Greg recently reported 2 patches that could not be applied without conflicts in v5.10:

- e32d262c89e2 ("mptcp: handle consistently DSS corruption")
- 4dabcdf58121 ("tcp: fix mptcp DSS corruption due to large pmtu xmit")

Conflicts have been resolved, and documented in each patch.

One extra commit has been backported, to support allow_infinite_fallback which is used by one commit from the list above:

- 0530020a7c8f ("mptcp: track and update contiguous data status")

Geliang Tang (1):
mptcp: track and update contiguous data status

Paolo Abeni (2):
mptcp: handle consistently DSS corruption
tcp: fix mptcp DSS corruption due to large pmtu xmit

 net/ipv4/tcp_output.c |  2 +-
 net/mptcp/mib.c       |  2 ++
 net/mptcp/mib.h       |  2 ++
 net/mptcp/protocol.c  | 26 ++++++++++++++++++++++----
 net/mptcp/protocol.h  |  1 +
 net/mptcp/subflow.c   |  3 ++-
 6 files changed, 30 insertions(+), 6 deletions(-)
Signature · 1 line
2.45.2