From mboxrd@z Thu Jan 1 00:00:00 1970 From: Anders Roxell Subject: [PATCH] net/core/filter: fix unused-variable warning Date: Fri, 7 Sep 2018 14:50:05 +0200 Message-ID: <20180907125005.32383-1-anders.roxell@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Anders Roxell To: davem@davemloft.net, ast@kernel.org, daniel@iogearbox.net, tehnerd@fb.com Return-path: Received: from mail-lj1-f193.google.com ([209.85.208.193]:47015 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727724AbeIGRbJ (ORCPT ); Fri, 7 Sep 2018 13:31:09 -0400 Received: by mail-lj1-f193.google.com with SMTP id 203-v6so12149834ljj.13 for ; Fri, 07 Sep 2018 05:50:20 -0700 (PDT) Sender: netdev-owner@vger.kernel.org List-ID: Building with CONFIG_INET=n will show the warning below: net/core/filter.c: In function ‘____bpf_getsockopt’: net/core/filter.c:4048:19: warning: unused variable ‘tp’ [-Wunused-variable] struct tcp_sock *tp; ^~ net/core/filter.c:4046:31: warning: unused variable ‘icsk’ [-Wunused-variable] struct inet_connection_sock *icsk; ^~~~ Move the variable declarations inside the {} block where they are used. Fixes: 1e215300f138 ("bpf: add TCP_SAVE_SYN/TCP_SAVED_SYN options for bpf_(set|get)sockopt") Signed-off-by: Anders Roxell --- net/core/filter.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/core/filter.c b/net/core/filter.c index d301134bca3a..0ae7185b2207 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -4043,14 +4043,14 @@ static const struct bpf_func_proto bpf_setsockopt_proto = { BPF_CALL_5(bpf_getsockopt, struct bpf_sock_ops_kern *, bpf_sock, int, level, int, optname, char *, optval, int, optlen) { - struct inet_connection_sock *icsk; struct sock *sk = bpf_sock->sk; - struct tcp_sock *tp; if (!sk_fullsock(sk)) goto err_clear; #ifdef CONFIG_INET if (level == SOL_TCP && sk->sk_prot->getsockopt == tcp_getsockopt) { + struct inet_connection_sock *icsk; + struct tcp_sock *tp; switch (optname) { case TCP_CONGESTION: icsk = inet_csk(sk); -- 2.18.0