diff options
author | Arnd Bergmann | 2019-07-08 14:57:21 +0200 |
---|---|---|
committer | Daniel Borkmann | 2019-07-08 17:18:03 +0200 |
commit | bef8e2639242e7f7214f1ab3b37ace1415a4f750 (patch) | |
tree | 8c8a032b8f5586f1a661847870ca6e60d5c9cf78 | |
parent | bpf: cgroup: Fix build error without CONFIG_NET (diff) | |
download | kernel-qcow2-linux-bef8e2639242e7f7214f1ab3b37ace1415a4f750.tar.gz kernel-qcow2-linux-bef8e2639242e7f7214f1ab3b37ace1415a4f750.tar.xz kernel-qcow2-linux-bef8e2639242e7f7214f1ab3b37ace1415a4f750.zip |
bpf: avoid unused variable warning in tcp_bpf_rtt()
When CONFIG_BPF is disabled, we get a warning for an unused
variable:
In file included from drivers/target/target_core_device.c:26:
include/net/tcp.h:2226:19: error: unused variable 'tp' [-Werror,-Wunused-variable]
struct tcp_sock *tp = tcp_sk(sk);
The variable is only used in one place, so it can be
replaced with its value there to avoid the warning.
Fixes: 23729ff23186 ("bpf: add BPF_CGROUP_SOCK_OPS callback that is executed on every RTT")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Soheil Hassas Yeganeh <soheil@google.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
-rw-r--r-- | include/net/tcp.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index e16d8a3fd3b4..cca3c59b98bf 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -2223,9 +2223,7 @@ static inline bool tcp_bpf_ca_needs_ecn(struct sock *sk) static inline void tcp_bpf_rtt(struct sock *sk) { - struct tcp_sock *tp = tcp_sk(sk); - - if (BPF_SOCK_OPS_TEST_FLAG(tp, BPF_SOCK_OPS_RTT_CB_FLAG)) + if (BPF_SOCK_OPS_TEST_FLAG(tcp_sk(sk), BPF_SOCK_OPS_RTT_CB_FLAG)) tcp_call_bpf(sk, BPF_SOCK_OPS_RTT_CB, 0, NULL); } |