[MPTCP] Re: [PATCH 1/2] mptcp: fix compilation error without IPV6

* [MPTCP] Re: [PATCH 1/2] mptcp: fix compilation error without IPV6
@ 2020-03-19  9:24 Paolo Abeni
  0 siblings, 0 replies; 2+ messages in thread
From: Paolo Abeni @ 2020-03-19  9:24 UTC (permalink / raw)
  To: mptcp

[-- Attachment #1: Type: text/plain, Size: 1956 bytes --]

Hi,

On Thu, 2020-03-19 at 10:05 +0100, Matthieu Baerts wrote:
>   net/mptcp/options.c: In function ‘add_addr_hmac_valid’:
>   net/mptcp/options.c:796:39: error: ‘struct mptcp_options_received’ has no member named ‘addr6’; did you mean ‘addr’?
>     796 |             mp_opt->addr_id, &mp_opt->addr6);
>         |                                       ^~~~~
>         |                                       addr
> 
> Fixes: 8536089ea875 (mptcp: v1 ADD_ADDR changes: add_addr_hmac_valid)
> Signed-off-by: Matthieu Baerts <matthieu.baerts(a)tessares.net>
> ---
> 
> Notes:
>     to be squashed in "mptcp: Add path manager interface"
> 
>  net/mptcp/options.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/net/mptcp/options.c b/net/mptcp/options.c
> index 1f64619be5c0..919f727cc7de 100644
> --- a/net/mptcp/options.c
> +++ b/net/mptcp/options.c
> @@ -781,7 +781,7 @@ static void update_una(struct mptcp_sock *msk,
>  static bool add_addr_hmac_valid(struct mptcp_subflow_context *subflow,
>  				struct mptcp_options_received *mp_opt)
>  {
> -	u64 hmac;
> +	u64 hmac = 0;
>  
>  	if (mp_opt->echo)
>  		return true;
> @@ -790,10 +790,12 @@ static bool add_addr_hmac_valid(struct mptcp_subflow_context *subflow,
>  		hmac = add_addr_generate_hmac(subflow->remote_key,
>  					      subflow->local_key,
>  					      mp_opt->addr_id, &mp_opt->addr);
> +#if IS_ENABLED(CONFIG_MPTCP_IPV6)
>  	else
>  		hmac = add_addr6_generate_hmac(subflow->remote_key,
>  					       subflow->local_key,
>  					       mp_opt->addr_id, &mp_opt->addr6);
> +#endif
>  
>  	pr_debug("subflow=%p, ahmac=%llu, mp_opt->ahmac=%llu\n",
>  		 subflow, (unsigned long long)hmac,
> -- 
> 2.25.1
> _______________________________________________
> mptcp mailing list -- mptcp(a)lists.01.org
> To unsubscribe send an email to mptcp-leave(a)lists.01.org

Both patches LGTM, thanks!

Paolo

^ permalink raw reply	[flat|nested] 2+ messages in thread