2020-03-18 02:11:25

by Yue Haibing

Subject: [PATCH net-next] mptcp: Remove set but not used variable 'can_ack'

Fixes gcc '-Wunused-but-set-variable' warning:

net/mptcp/options.c: In function 'mptcp_established_options_dss':
net/mptcp/options.c:338:7: warning:
variable 'can_ack' set but not used [-Wunused-but-set-variable]

commit dc093db5cc05 ("mptcp: drop unneeded checks")
leave behind this unused, remove it.

Signed-off-by: YueHaibing <[email protected]>
---
net/mptcp/options.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/net/mptcp/options.c b/net/mptcp/options.c
index 63c8ee49cef2..8ba34950241c 100644
--- a/net/mptcp/options.c
+++ b/net/mptcp/options.c
@@ -335,7 +335,6 @@ static bool mptcp_established_options_dss(struct sock *sk, struct sk_buff *skb,
struct mptcp_sock *msk;
unsigned int ack_size;
bool ret = false;
- bool can_ack;
u8 tcp_fin;

if (skb) {
@@ -364,7 +363,6 @@ static bool mptcp_established_options_dss(struct sock *sk, struct sk_buff *skb,
/* passive sockets msk will set the 'can_ack' after accept(), even
* if the first subflow may have the already the remote key handy
*/
- can_ack = true;
opts->ext_copy.use_ack = 0;
msk = mptcp_sk(subflow->conn);
if (!READ_ONCE(msk->can_ack)) {

2020-03-18 09:28:30

by Paolo Abeni

Subject: Re: [PATCH net-next] mptcp: Remove set but not used variable 'can_ack'

On Wed, 2020-03-18 at 02:01 +0000, YueHaibing wrote:
> Fixes gcc '-Wunused-but-set-variable' warning:
>
> net/mptcp/options.c: In function 'mptcp_established_options_dss':
> net/mptcp/options.c:338:7: warning:
> variable 'can_ack' set but not used [-Wunused-but-set-variable]
>
> commit dc093db5cc05 ("mptcp: drop unneeded checks")
> leave behind this unused, remove it.
>
> Signed-off-by: YueHaibing <[email protected]>
> ---
> net/mptcp/options.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/net/mptcp/options.c b/net/mptcp/options.c
> index 63c8ee49cef2..8ba34950241c 100644
> --- a/net/mptcp/options.c
> +++ b/net/mptcp/options.c
> @@ -335,7 +335,6 @@ static bool mptcp_established_options_dss(struct sock *sk, struct sk_buff *skb,
> struct mptcp_sock *msk;
> unsigned int ack_size;
> bool ret = false;
> - bool can_ack;
> u8 tcp_fin;
>
> if (skb) {
> @@ -364,7 +363,6 @@ static bool mptcp_established_options_dss(struct sock *sk, struct sk_buff *skb,
> /* passive sockets msk will set the 'can_ack' after accept(), even
> * if the first subflow may have the already the remote key handy
> */
> - can_ack = true;
> opts->ext_copy.use_ack = 0;
> msk = mptcp_sk(subflow->conn);
> if (!READ_ONCE(msk->can_ack)) {

Yep, left-over on my side! Thanks for clearing it!

Acked-by: Paolo Abeni <[email protected]>

2020-03-22 03:21:52

by David Miller

Subject: Re: [PATCH net-next] mptcp: Remove set but not used variable 'can_ack'

From: YueHaibing <[email protected]>
Date: Wed, 18 Mar 2020 02:01:57 +0000

> Fixes gcc '-Wunused-but-set-variable' warning:
>
> net/mptcp/options.c: In function 'mptcp_established_options_dss':
> net/mptcp/options.c:338:7: warning:
> variable 'can_ack' set but not used [-Wunused-but-set-variable]
>
> commit dc093db5cc05 ("mptcp: drop unneeded checks")
> leave behind this unused, remove it.
>
> Signed-off-by: YueHaibing <[email protected]>

Applied, thanks.