[v1] for bpf-next

[PATCH mptcp-next 01/17] mptcp: move MPTCPOPT_HMAC_LEN to net/mptcp.h

Posted by Geliang Tang 3 years, 4 months ago

Move macro MPTCPOPT_HMAC_LEN definition from net/mptcp/protocol.h to
include/net/mptcp.h.

Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
 include/net/mptcp.h  | 3 ++-
 net/mptcp/protocol.h | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/net/mptcp.h b/include/net/mptcp.h
index d4ec894ce67b..4713757e36c1 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
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index 200f89f6d62f..8f03775a2f22 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -83,7 +83,6 @@
 
 /* MPTCP MP_JOIN flags */
 #define MPTCPOPT_BACKUP		BIT(0)
-#define MPTCPOPT_HMAC_LEN	20
 #define MPTCPOPT_THMAC_LEN	8
 
 /* MPTCP MP_CAPABLE flags */
-- 
2.34.1

Re: [PATCH mptcp-next 01/17] mptcp: move MPTCPOPT_HMAC_LEN to net/mptcp.h

Posted by Mat Martineau 3 years, 4 months ago

On Wed, 18 May 2022, Geliang Tang wrote:

> Move macro MPTCPOPT_HMAC_LEN definition from net/mptcp/protocol.h to
> include/net/mptcp.h.
>
> Signed-off-by: Geliang Tang <geliang.tang@suse.com>

This one's fine for the mptcp tree (will upstream to net-next):

Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>

> ---
> include/net/mptcp.h  | 3 ++-
> net/mptcp/protocol.h | 1 -
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/include/net/mptcp.h b/include/net/mptcp.h
> index d4ec894ce67b..4713757e36c1 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
> diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
> index 200f89f6d62f..8f03775a2f22 100644
> --- a/net/mptcp/protocol.h
> +++ b/net/mptcp/protocol.h
> @@ -83,7 +83,6 @@
>
> /* MPTCP MP_JOIN flags */
> #define MPTCPOPT_BACKUP		BIT(0)
> -#define MPTCPOPT_HMAC_LEN	20
> #define MPTCPOPT_THMAC_LEN	8
>
> /* MPTCP MP_CAPABLE flags */
> -- 
> 2.34.1
>
>
>

--
Mat Martineau
Intel

Re: [PATCH mptcp-next 01/17] mptcp: move MPTCPOPT_HMAC_LEN to net/mptcp.h

Posted by Matthieu Baerts 3 years, 4 months ago

Hi Geliang, Mat,

On 19/05/2022 17:06, Mat Martineau wrote:
> On Wed, 18 May 2022, Geliang Tang wrote:
> 
>> Move macro MPTCPOPT_HMAC_LEN definition from net/mptcp/protocol.h to
>> include/net/mptcp.h.
>>
>> Signed-off-by: Geliang Tang <geliang.tang@suse.com>
> 
> This one's fine for the mptcp tree (will upstream to net-next):
> 
> Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>

Thank you for the patch and the review!

Now in our tree (feat. for net-next) with Mat's RvB tag:

New patches for t/upstream:

- e4afdbb036ca: mptcp: move MPTCPOPT_HMAC_LEN to net/mptcp.h

- Results: 086d4a4a0f34..52d9427a77d9 (export)

Builds and tests are now in progress:



https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20220519T160645

https://github.com/multipath-tcp/mptcp_net-next/actions/workflows/build-validation.yml?query=branch:export

Cheers,
Matt
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net