diff options
| author | David S. Miller <davem@davemloft.net> | 2021-04-07 14:09:40 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-04-07 14:09:40 -0700 |
| commit | 956c7831fe9db52dba7a59a2ccb82a83c5cae9c4 (patch) | |
| tree | ecab1b16cc976d788105879860c0b6727b2c76d3 /include/net/mptcp.h | |
| parent | 0b35e0deb5bee7d4882356d6663522c1562a8321 (diff) | |
| parent | 07f8252fe0e3c2b6320eeff18bdc5b7fb8845cb3 (diff) | |
Merge branch 'mptcp-next'
Mat Martineau says:
====================
mptcp: Cleanup, a new test case, and header trimming
Some more patches to include from the MPTCP tree:
Patches 1-6 refactor an address-related data structure and reduce some
duplicate code that handles IPv4 and IPv6 addresses.
Patch 7 adds a test case for the MPTCP netlink interface, passing a
specific ifindex to the kernel.
Patch 8 drops extra header options from IPv4 address echo packets,
improving consistency and testability between IPv4 and IPv6.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/mptcp.h')
| -rw-r--r-- | include/net/mptcp.h | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/include/net/mptcp.h b/include/net/mptcp.h index 16fe34d139c3..83f23774b908 100644 --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@ -41,20 +41,25 @@ struct mptcp_rm_list { u8 nr; }; +struct mptcp_addr_info { + u8 id; + sa_family_t family; + __be16 port; + union { + struct in_addr addr; +#if IS_ENABLED(CONFIG_MPTCP_IPV6) + struct in6_addr addr6; +#endif + }; +}; + struct mptcp_out_options { #if IS_ENABLED(CONFIG_MPTCP) u16 suboptions; u64 sndr_key; u64 rcvr_key; - union { - struct in_addr addr; -#if IS_ENABLED(CONFIG_MPTCP_IPV6) - struct in6_addr addr6; -#endif - }; - u8 addr_id; - u16 port; u64 ahmac; + struct mptcp_addr_info addr; struct mptcp_rm_list rm_list; u8 join_id; u8 backup; |