diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-03-08 22:06:15 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-03-08 22:06:15 -0800 |
| commit | 964efdab03490d40d8e458b6a1ddf02aae212567 (patch) | |
| tree | eb14f91635bc38a1f4ec50ea5e02ad569178654d /include | |
| parent | d307eab593b283849c13703ca3fd6a5b3908d6f8 (diff) | |
| parent | 0dc626e5e853a966dfbb6ee6cd607e13a2acd5ae (diff) | |
Merge branch 'mptcp-advertisement-reliability-improvement-and-misc-updates'
Mat Martineau says:
====================
mptcp: Advertisement reliability improvement and misc. updates
Patch 1 adds a helpful debug tracepoint for outgoing MPTCP packets.
Patch 2 is a small "magic number" refactor.
Patches 3 & 4 refactor parts of the mptcp_join.sh selftest. No change in
test coverage.
Patch 5 ensures only advertised address IDs are un-advertised.
Patches 6-8 improve handling of an edge case where endpoint IDs need to
be created on-the-fly when adding subflows. Includes selftest coverage.
Patch 9 adds validation of the fullmesh flag in a MPTCP netlink command,
which was overlooked when this flag was introduced for 5.18.
====================
Link: https://lore.kernel.org/r/20220307204439.65164-1-mathew.j.martineau@linux.intel.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/trace/events/mptcp.h | 4 | ||||
| -rw-r--r-- | include/uapi/linux/mptcp.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/trace/events/mptcp.h b/include/trace/events/mptcp.h index 6bf43176f14c..f8e28e686c65 100644 --- a/include/trace/events/mptcp.h +++ b/include/trace/events/mptcp.h @@ -115,6 +115,10 @@ DECLARE_EVENT_CLASS(mptcp_dump_mpext, __entry->csum_reqd) ); +DEFINE_EVENT(mptcp_dump_mpext, mptcp_sendmsg_frag, + TP_PROTO(struct mptcp_ext *mpext), + TP_ARGS(mpext)); + DEFINE_EVENT(mptcp_dump_mpext, get_mapping_status, TP_PROTO(struct mptcp_ext *mpext), TP_ARGS(mpext)); diff --git a/include/uapi/linux/mptcp.h b/include/uapi/linux/mptcp.h index f106a3941cdf..9690efedb5fa 100644 --- a/include/uapi/linux/mptcp.h +++ b/include/uapi/linux/mptcp.h @@ -81,6 +81,7 @@ enum { #define MPTCP_PM_ADDR_FLAG_SUBFLOW (1 << 1) #define MPTCP_PM_ADDR_FLAG_BACKUP (1 << 2) #define MPTCP_PM_ADDR_FLAG_FULLMESH (1 << 3) +#define MPTCP_PM_ADDR_FLAG_IMPLICIT (1 << 4) enum { MPTCP_PM_CMD_UNSPEC, |