Skip to content

mptcp: fix recent failed backports (20250721)

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 6 repliesApplied

Patches in v1 Applied

#Subject and filesSizeRepliesApplied
1/3mptcp: make fallback action and fallback decision atomicnet/mptcp/options.c net/mptcp/protocol.c net/mptcp/protocol.h +1 more+58 -192 replies
2/3mptcp: plug races between subflow fail and subflow creationnet/mptcp/pm.c net/mptcp/protocol.c net/mptcp/protocol.h +1 more+32 -132 replies
3/3mptcp: reset fallback status gracefully at disconnect() timenet/mptcp/protocol.c+9 -02 replies

Reviews trailers per patch

All 3 patches have a Reviewed-by or Acked-by.

PatchMatthieu Baerts (NGI0)
1/3R-b R-b
2/3R-b R-b
3/3R-b R-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 6.1.y 0/3] mptcp: fix recent failed backports (20250721)

Greg recently reported 3 patches that could not be applied without conflicts in v6.1:

- f8a1d9b18c5e ("mptcp: make fallback action and fallback decision atomic")
- def5b7b2643e ("mptcp: plug races between subflow fail and subflow creation")
- da9b2fc7b73d ("mptcp: reset fallback status gracefully at disconnect() time")

Conflicts have been resolved, and documented in each patch.

Paolo Abeni (3):
mptcp: make fallback action and fallback decision atomic
mptcp: plug races between subflow fail and subflow creation
mptcp: reset fallback status gracefully at disconnect() time

 net/mptcp/options.c  |  3 ++-
 net/mptcp/pm.c       |  8 ++++++-
 net/mptcp/protocol.c | 55 ++++++++++++++++++++++++++++++++++++--------
 net/mptcp/protocol.h | 27 +++++++++++++++++-----
 net/mptcp/subflow.c  | 30 +++++++++++++++---------
 5 files changed, 95 insertions(+), 28 deletions(-)
Signature · 1 line
2.50.0