| Message ID | 20200121231415.3101697-1-matthieu.baerts@tessares.net |
|---|---|
| State | Accepted, archived |
| Delegated to: | Matthieu Baerts |
| Headers | show |
| Series | [v2] mptcp: fix compilation warning without IPV6 | expand |
On Wed, 22 Jan 2020, Matthieu Baerts wrote: > Spot by Mat: > > net/mptcp/protocol.c: In function ‘mptcp_copy_inaddrs’: > net/mptcp/protocol.c:672:21: warning: unused variable ‘msk6’ [-Wunused-variable] > 672 | struct ipv6_pinfo *msk6 = inet6_sk(msk); > | ^~~~ > net/mptcp/protocol.c:671:27: warning: unused variable ‘ssk6’ [-Wunused-variable] > 671 | const struct ipv6_pinfo *ssk6 = inet6_sk(ssk); > | ^~~~ > > v2: > - reorder the code to avoid 2 #ifdef (Mat) > > Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net> > --- > > Notes: > to be squashed in "mptcp: Create SUBFLOW socket for incoming connections" > > net/mptcp/protocol.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c > index 84799a5212a2..e08a25eabcd5 100644 > --- a/net/mptcp/protocol.c > +++ b/net/mptcp/protocol.c > @@ -217,17 +217,10 @@ static void mptcp_close(struct sock *sk, long timeout) > > static void mptcp_copy_inaddrs(struct sock *msk, const struct sock *ssk) > { > +#if IS_ENABLED(CONFIG_MPTCP_IPV6) > const struct ipv6_pinfo *ssk6 = inet6_sk(ssk); > struct ipv6_pinfo *msk6 = inet6_sk(msk); > > - inet_sk(msk)->inet_num = inet_sk(ssk)->inet_num; > - inet_sk(msk)->inet_dport = inet_sk(ssk)->inet_dport; > - inet_sk(msk)->inet_sport = inet_sk(ssk)->inet_sport; > - inet_sk(msk)->inet_daddr = inet_sk(ssk)->inet_daddr; > - inet_sk(msk)->inet_saddr = inet_sk(ssk)->inet_saddr; > - inet_sk(msk)->inet_rcv_saddr = inet_sk(ssk)->inet_rcv_saddr; > - > -#if IS_ENABLED(CONFIG_MPTCP_IPV6) > msk->sk_v6_daddr = ssk->sk_v6_daddr; > msk->sk_v6_rcv_saddr = ssk->sk_v6_rcv_saddr; > > @@ -236,6 +229,13 @@ static void mptcp_copy_inaddrs(struct sock *msk, const struct sock *ssk) > msk6->flow_label = ssk6->flow_label; > } > #endif > + > + inet_sk(msk)->inet_num = inet_sk(ssk)->inet_num; > + inet_sk(msk)->inet_dport = inet_sk(ssk)->inet_dport; > + inet_sk(msk)->inet_sport = inet_sk(ssk)->inet_sport; > + inet_sk(msk)->inet_daddr = inet_sk(ssk)->inet_daddr; > + inet_sk(msk)->inet_saddr = inet_sk(ssk)->inet_saddr; > + inet_sk(msk)->inet_rcv_saddr = inet_sk(ssk)->inet_rcv_saddr; > } > > static struct sock *mptcp_accept(struct sock *sk, int flags, int *err, > -- > 2.24.0 v2 looks good, thanks Matthieu! -- Mat Martineau Intel
Hi Mat, On 22/01/2020 00:16, Mat Martineau wrote: > On Wed, 22 Jan 2020, Matthieu Baerts wrote: > >> Spot by Mat: >> >> net/mptcp/protocol.c: In function ‘mptcp_copy_inaddrs’: >> net/mptcp/protocol.c:672:21: warning: unused variable ‘msk6’ >> [-Wunused-variable] >> 672 | struct ipv6_pinfo *msk6 = inet6_sk(msk); >> | ^~~~ >> net/mptcp/protocol.c:671:27: warning: unused variable ‘ssk6’ >> [-Wunused-variable] >> 671 | const struct ipv6_pinfo *ssk6 = inet6_sk(ssk); >> | ^~~~ >> >> v2: >> - reorder the code to avoid 2 #ifdef (Mat) >> >> Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net> >> --- >> >> Notes: >> to be squashed in "mptcp: Create SUBFLOW socket for incoming >> connections" >> >> net/mptcp/protocol.c | 16 ++++++++-------- >> 1 file changed, 8 insertions(+), 8 deletions(-) >> >> diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c >> index 84799a5212a2..e08a25eabcd5 100644 >> --- a/net/mptcp/protocol.c >> +++ b/net/mptcp/protocol.c >> @@ -217,17 +217,10 @@ static void mptcp_close(struct sock *sk, long >> timeout) >> >> static void mptcp_copy_inaddrs(struct sock *msk, const struct sock *ssk) >> { >> +#if IS_ENABLED(CONFIG_MPTCP_IPV6) >> const struct ipv6_pinfo *ssk6 = inet6_sk(ssk); >> struct ipv6_pinfo *msk6 = inet6_sk(msk); >> >> - inet_sk(msk)->inet_num = inet_sk(ssk)->inet_num; >> - inet_sk(msk)->inet_dport = inet_sk(ssk)->inet_dport; >> - inet_sk(msk)->inet_sport = inet_sk(ssk)->inet_sport; >> - inet_sk(msk)->inet_daddr = inet_sk(ssk)->inet_daddr; >> - inet_sk(msk)->inet_saddr = inet_sk(ssk)->inet_saddr; >> - inet_sk(msk)->inet_rcv_saddr = inet_sk(ssk)->inet_rcv_saddr; >> - >> -#if IS_ENABLED(CONFIG_MPTCP_IPV6) >> msk->sk_v6_daddr = ssk->sk_v6_daddr; >> msk->sk_v6_rcv_saddr = ssk->sk_v6_rcv_saddr; >> >> @@ -236,6 +229,13 @@ static void mptcp_copy_inaddrs(struct sock *msk, >> const struct sock *ssk) >> msk6->flow_label = ssk6->flow_label; >> } >> #endif >> + >> + inet_sk(msk)->inet_num = inet_sk(ssk)->inet_num; >> + inet_sk(msk)->inet_dport = inet_sk(ssk)->inet_dport; >> + inet_sk(msk)->inet_sport = inet_sk(ssk)->inet_sport; >> + inet_sk(msk)->inet_daddr = inet_sk(ssk)->inet_daddr; >> + inet_sk(msk)->inet_saddr = inet_sk(ssk)->inet_saddr; >> + inet_sk(msk)->inet_rcv_saddr = inet_sk(ssk)->inet_rcv_saddr; >> } >> >> static struct sock *mptcp_accept(struct sock *sk, int flags, int *err, >> -- >> 2.24.0 > > v2 looks good, thanks Matthieu! Thank you for the review! - 9f2ecf220b2a: "squashed" in "mptcp: Create SUBFLOW socket for incoming connections - fa392a833065..92b5d1d8b2b8: result Tests and export are in progress. Cheers, Matt
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 84799a5212a2..e08a25eabcd5 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -217,17 +217,10 @@ static void mptcp_close(struct sock *sk, long timeout) static void mptcp_copy_inaddrs(struct sock *msk, const struct sock *ssk) { +#if IS_ENABLED(CONFIG_MPTCP_IPV6) const struct ipv6_pinfo *ssk6 = inet6_sk(ssk); struct ipv6_pinfo *msk6 = inet6_sk(msk); - inet_sk(msk)->inet_num = inet_sk(ssk)->inet_num; - inet_sk(msk)->inet_dport = inet_sk(ssk)->inet_dport; - inet_sk(msk)->inet_sport = inet_sk(ssk)->inet_sport; - inet_sk(msk)->inet_daddr = inet_sk(ssk)->inet_daddr; - inet_sk(msk)->inet_saddr = inet_sk(ssk)->inet_saddr; - inet_sk(msk)->inet_rcv_saddr = inet_sk(ssk)->inet_rcv_saddr; - -#if IS_ENABLED(CONFIG_MPTCP_IPV6) msk->sk_v6_daddr = ssk->sk_v6_daddr; msk->sk_v6_rcv_saddr = ssk->sk_v6_rcv_saddr; @@ -236,6 +229,13 @@ static void mptcp_copy_inaddrs(struct sock *msk, const struct sock *ssk) msk6->flow_label = ssk6->flow_label; } #endif + + inet_sk(msk)->inet_num = inet_sk(ssk)->inet_num; + inet_sk(msk)->inet_dport = inet_sk(ssk)->inet_dport; + inet_sk(msk)->inet_sport = inet_sk(ssk)->inet_sport; + inet_sk(msk)->inet_daddr = inet_sk(ssk)->inet_daddr; + inet_sk(msk)->inet_saddr = inet_sk(ssk)->inet_saddr; + inet_sk(msk)->inet_rcv_saddr = inet_sk(ssk)->inet_rcv_saddr; } static struct sock *mptcp_accept(struct sock *sk, int flags, int *err,
Spot by Mat: net/mptcp/protocol.c: In function ‘mptcp_copy_inaddrs’: net/mptcp/protocol.c:672:21: warning: unused variable ‘msk6’ [-Wunused-variable] 672 | struct ipv6_pinfo *msk6 = inet6_sk(msk); | ^~~~ net/mptcp/protocol.c:671:27: warning: unused variable ‘ssk6’ [-Wunused-variable] 671 | const struct ipv6_pinfo *ssk6 = inet6_sk(ssk); | ^~~~ v2: - reorder the code to avoid 2 #ifdef (Mat) Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net> --- Notes: to be squashed in "mptcp: Create SUBFLOW socket for incoming connections" net/mptcp/protocol.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)