diff options
| author | David S. Miller <davem@davemloft.net> | 2022-07-09 12:19:24 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-07-09 12:19:24 +0100 |
| commit | be587adbf88a064e04eb1e65e5e31a75c2bfc9e2 (patch) | |
| tree | 7b4adf7532665e1dd187bee5e554afc274dd7d19 /include/net/mptcp.h | |
| parent | 9f7cb73ef64b17e9bd97a62a2b18282461abde61 (diff) | |
| parent | 65ebc6676d17847dde26dcbe50627a2fe198ca4b (diff) | |
Merge branch 'mptcp-selftest-improvements-and-header-tweak'
Mat Martineau says:
====================
mptcp: Self test improvements and a header tweak
Patch 1 moves a definition to a header so it can be used in a struct
declaration.
Patch 2 adjusts a time threshold for a selftest that runs much slower on
debug kernels (and even more on slow CI infrastructure), to reduce
spurious failures.
Patches 3 & 4 improve userspace PM test coverage.
Patches 5 & 6 clean up output from a test script and selftest helper
tool.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/mptcp.h')
| -rw-r--r-- | include/net/mptcp.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/mptcp.h b/include/net/mptcp.h index 4d761ad530c9..ac9cf7271d46 100644 --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@ -39,6 +39,7 @@ struct mptcp_ext { infinite_map:1; }; +#define MPTCPOPT_HMAC_LEN 20 #define MPTCP_RM_IDS_MAX 8 struct mptcp_rm_list { @@ -89,7 +90,7 @@ struct mptcp_out_options { u32 nonce; u32 token; u64 thmac; - u8 hmac[20]; + u8 hmac[MPTCPOPT_HMAC_LEN]; }; }; #endif |