| Message ID | 20200319090502.2275907-1-matthieu.baerts@tessares.net |
|---|---|
| State | Accepted, archived |
| Delegated to: | Matthieu Baerts |
| Headers | show |
| Series | [1/2] mptcp: fix compilation error without IPV6 | expand |
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@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@lists.01.org > To unsubscribe send an email to mptcp-leave@lists.01.org Both patches LGTM, thanks! Paolo
Hi Paolo, On 19/03/2020 10:24, Paolo Abeni wrote: > 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@tessares.net> (...) > Both patches LGTM, thanks! Thank you for the review! - cc2ee05dc8b7: "squashed" patch 2/2 in "mptcp: Add ADD_ADDR handling" - 9bd3412b5201: "squashed" in "mptcp: Add path manager interface" - 643e943f5de4..ca158067259a: result Tests + export will be launched soon. Cheers, Matt
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,
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@tessares.net> --- Notes: to be squashed in "mptcp: Add path manager interface" net/mptcp/options.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)