[PATCH 6.1.y 0/3] Backport of "mptcp: fix full TCP keep-alive support"

It looks like the patch "mptcp: fix full TCP keep-alive support" has been backported up to v6.8 recently (thanks!), but not before due to conflicts.

I had to adapt a bit the code not to backport new features, but the modifications were simple, and isolated from the rest. Conflicts have been described in each patch.

MPTCP sockopts tests have been executed, and no issues have been reported.

Matthieu Baerts (NGI0) (1): mptcp: fix full TCP keep-alive support

Paolo Abeni (2): mptcp: avoid some duplicate code in socket option handling mptcp: cleanup SOL_TCP handling

net/mptcp/protocol.h | 3 + net/mptcp/sockopt.c | 144 +++++++++++++++++++++++++++++++------------ 2 files changed, 108 insertions(+), 39 deletions(-)