Skip to content

mptcp: fix recent failed backports (20260919)

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 Latest4 patches 4 repliesApplied

Patches in v1 Applied

#Subject and filesSizeRepliesApplied
1/4mptcp: move the stale logic out of retrans schedulernet/mptcp/pm.c net/mptcp/protocol.c net/mptcp/protocol.h+36 -201 reply
2/4mptcp: avoid unneeded actions on subflow resetnet/mptcp/protocol.c net/mptcp/protocol.h net/mptcp/subflow.c+15 -31 reply
3/4mptcp: close race between scheduler and state changenet/mptcp/protocol.c+3 -11 reply
4/4mptcp: fix bad accounting in __mptcp_subflow_push_pending()net/mptcp/protocol.c+2 -11 reply

Reviews trailers per patch

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

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

The following patches could not be applied without conflicts in this tree:

- 2b0f561f21b2 ("mptcp: avoid unneeded actions on subflow reset")
- 42064de57fb8 ("mptcp: close race between scheduler and state change")
- f3ef03357396 ("mptcp: fix bad accounting in __mptcp_subflow_push_pending()")

I backported the following commit to avoid conflicts:

- 6cafe51e0f98 ("mptcp: move the stale logic out of retrans scheduler")

Paolo Abeni (4):
mptcp: move the stale logic out of retrans scheduler
mptcp: avoid unneeded actions on subflow reset
mptcp: close race between scheduler and state change
mptcp: fix bad accounting in __mptcp_subflow_push_pending()

 net/mptcp/pm.c       | 41 +++++++++++++++++++++++++++--------------
 net/mptcp/protocol.c | 15 +++++++++------
 net/mptcp/protocol.h | 10 +++++++---
 net/mptcp/subflow.c  | 11 +++++++++++
 4 files changed, 54 insertions(+), 23 deletions(-)
Signature · 1 line
2.55.0