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", a simple refactoring that can be picked to ease the backports. Including this patch avoids conflicts with the two other patches.
While at it, also picked the modifications of the selftests to validate the other modifications.
If you prefer, feel free to backport these 5 commits to v6.10:
c95eb32ced82 cd7c957f936f 85df533a787b bec1f3b119eb 4d2868b5d191
In this order, and thanks to c95eb32ced82, there are no conflicts.
Details:
- 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") - bec1f3b119eb ("selftests: mptcp: join: ability to invert ADD_ADDR check") - 4d2868b5d191 ("selftests: mptcp: join: test both signal & subflow")
Matthieu Baerts (NGI0) (5): 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: ability to invert ADD_ADDR check selftests: mptcp: join: test both signal & subflow
net/mptcp/pm_netlink.c | 43 ++++++++++----- .../testing/selftests/net/mptcp/mptcp_join.sh | 55 ++++++++++++++----- 2 files changed, 69 insertions(+), 29 deletions(-)