aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/filter.c
diff options
context:
space:
mode:
authorAnders Roxell <anders.roxell@linaro.org>2018-09-07 14:50:05 +0200
committerAlexei Starovoitov <ast@kernel.org>2018-09-11 14:54:52 -0700
commit1edb6e035eb72a17462ba275fe2db36c37a62909 (patch)
tree3f33396f58fc85d214b210d4700b5a125c002ac7 /net/core/filter.c
parenttools/bpf: fix a netlink recv issue (diff)
downloadlinux-dev-1edb6e035eb72a17462ba275fe2db36c37a62909.tar.xz
linux-dev-1edb6e035eb72a17462ba275fe2db36c37a62909.zip
net/core/filter: fix unused-variable warning
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 <anders.roxell@linaro.org> Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'net/core/filter.c')
-rw-r--r--net/core/filter.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/core/filter.c b/net/core/filter.c
index 8cb242b4400f..bf5b6efd369a 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -4051,14 +4051,15 @@ 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);