net/core/filter: fix unused-variable warning
Subsystems (4)
PATCH 1/1 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 <[email protected]>
--- net/core/filter.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/core/filter.c +2 -2
@@ -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);
Signature · 1 line
2.18.0
Quoted 25 lines · Anders Roxell
Building with
CONFIG_INET=nwill 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 <[email protected]>--- net/core/filter.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)net/core/filter.c +0
-1@@ -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;
net/core/filter.c static const struct bpf_func_proto bpf_setsockopt_proto = { · line 4054
Quoted 10 lines
net/core/filter.c +2
-1struct 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) {
I've added empty line after variable decl and applied.