* [PATCH net-next] bpf: fix to bpf_setsockops
@ 2017-07-02 16:14 Lawrence Brakmo
2017-07-02 22:17 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Lawrence Brakmo @ 2017-07-02 16:14 UTC (permalink / raw)
To: netdev
Cc: Kernel Team, Blake Matheny, Alexei Starovoitov, Daniel Borkmann,
David Ahern
Fixed build error due to misplaced "#ifdef CONFIG_INET" (moved 1
statement up).
Signed-off-by: Lawrence Brakmo <brakmo@fb.com>
---
net/core/filter.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/net/core/filter.c b/net/core/filter.c
index 523b91d..e5c280a 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -2717,9 +2717,9 @@ BPF_CALL_5(bpf_setsockopt, struct bpf_sock_ops_kern *, bpf_sock,
default:
ret = -EINVAL;
}
+#ifdef CONFIG_INET
} else if (level == SOL_TCP &&
sk->sk_prot->setsockopt == tcp_setsockopt) {
-#ifdef CONFIG_INET
if (optname == TCP_CONGESTION) {
char name[TCP_CA_NAME_MAX];
@@ -2757,7 +2757,6 @@ BPF_CALL_5(bpf_setsockopt, struct bpf_sock_ops_kern *, bpf_sock,
ret = -EINVAL;
}
}
-#else
ret = -EINVAL;
#endif
} else {
--
2.9.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next] bpf: fix to bpf_setsockops
2017-07-02 16:14 [PATCH net-next] bpf: fix to bpf_setsockops Lawrence Brakmo
@ 2017-07-02 22:17 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2017-07-02 22:17 UTC (permalink / raw)
To: brakmo; +Cc: netdev, kernel-team, bmatheny, ast, daniel, dsa
From: Lawrence Brakmo <brakmo@fb.com>
Date: Sun, 2 Jul 2017 09:14:28 -0700
> Fixed build error due to misplaced "#ifdef CONFIG_INET" (moved 1
> statement up).
>
> Signed-off-by: Lawrence Brakmo <brakmo@fb.com>
Applied, thank you.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-07-02 22:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-07-02 16:14 [PATCH net-next] bpf: fix to bpf_setsockops Lawrence Brakmo
2017-07-02 22:17 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.