Skip to content

Backport of "mptcp: pm: don't try to create sf if alloc failed" and more

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

Patches in v1 Applied

#Subject and filesSizeRepliesApplied
1/5mptcp: pass addr to mptcp_pm_alloc_anno_listnet/mptcp/pm_netlink.c net/mptcp/pm_userspace.c net/mptcp/protocol.h+6 -61 reply
2/5mptcp: pm: reduce indentation blocksnet/mptcp/pm_netlink.c+11 -81 reply
3/5mptcp: pm: don't try to create sf if alloc failednet/mptcp/pm_netlink.c+6 -41 reply
4/5mptcp: pm: do not ignore 'subflow' if 'signal' flag is also setnet/mptcp/pm_netlink.c+12 -41 reply
5/5selftests: mptcp: join: test both signal & subflowtools/testing/selftests/net/mptcp/mptcp_join.sh+14 -01 reply

Reviews trailers per patch

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

PatchMatthieu BaertsMat Martineau
1/5R-b R-b
2/5R-b R-b
3/5R-b R-b
4/5R-b R-b
5/5R-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/5] Backport of "mptcp: pm: don't try to create sf if alloc failed" and more

Patches "mptcp: pm: don't try to create sf if alloc failed" and "mptcp:
pm: do not ignore 'subflow' if 'signal' flag is also set" depend on "mptcp: pm: reduce indentation blocks" which depends on "mptcp: pass addr to mptcp_pm_alloc_anno_list". These two patches are simple ones, doing some refactoring that can be picked to ease the backports.

Including these patches avoids conflicts with the two other patches.

While at it, also picked the modifications of the selftests to validate the other modifications. Note that this last patch has been modified to work on v6.1.

If you prefer, feel free to backport these 5 commits to v6.1:

528cb5f2a1e8 c95eb32ced82 cd7c957f936f 85df533a787b 4d2868b5d191

In this order, and thanks to 528cb5f2a1e8 and c95eb32ced82, there are no conflicts.

Details:

- 528cb5f2a1e8 ("mptcp: pass addr to mptcp_pm_alloc_anno_list")
- c95eb32ced82 ("mptcp: pm: reduce indentation blocks")
- cd7c957f936f ("mptcp: pm: don't try to create sf if alloc failed")
- 85df533a787b ("mptcp: pm: do not ignore 'subflow' if 'signal' flag is also set")
- 4d2868b5d191 ("selftests: mptcp: join: test both signal & subflow")

Geliang Tang (1):
mptcp: pass addr to mptcp_pm_alloc_anno_list

Matthieu Baerts (NGI0) (4):
mptcp: pm: reduce indentation blocks
mptcp: pm: don't try to create sf if alloc failed
mptcp: pm: do not ignore 'subflow' if 'signal' flag is also set
selftests: mptcp: join: test both signal & subflow

 net/mptcp/pm_netlink.c                        | 49 ++++++++++++-------
 net/mptcp/pm_userspace.c                      |  2 +-
 net/mptcp/protocol.h                          |  2 +-
 .../testing/selftests/net/mptcp/mptcp_join.sh | 14 ++++++
 4 files changed, 47 insertions(+), 20 deletions(-)
Signature · 1 line
2.45.2