summaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorLawrence Brakmo <brakmo@fb.com>2017-07-02 09:14:28 -0700
committerDavid S. Miller <davem@davemloft.net>2017-07-02 15:16:52 -0700
commita5192c52377e6d283abb5dcd5d25d65bf2316f62 (patch)
tree039938181ed773367fb1a1d7f84f745b5cb868b5 /net/core
parentbcdb239b456265b927a809c4078f0a1f433a6e18 (diff)
downloadblackbird-obmc-linux-a5192c52377e6d283abb5dcd5d25d65bf2316f62.tar.gz
blackbird-obmc-linux-a5192c52377e6d283abb5dcd5d25d65bf2316f62.zip
bpf: fix to bpf_setsockops
Fixed build error due to misplaced "#ifdef CONFIG_INET" (moved 1 statement up). Signed-off-by: Lawrence Brakmo <brakmo@fb.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/filter.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/core/filter.c b/net/core/filter.c
index 523b91d25025..e5c280aa5de6 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 {
OpenPOWER on IntegriCloud