From: Lawrence Brakmo <brakmo@fb.com>
Date: Sun, 2 Jul 2017 09:14:28 -0700
Subject: bpf: fix to bpf_setsockops
Patch-mainline: v4.13-rc1
Git-commit: a5192c52377e6d283abb5dcd5d25d65bf2316f62
References: bsc#1109837
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>
Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
---
net/core/filter.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -2717,9 +2717,9 @@ BPF_CALL_5(bpf_setsockopt, struct bpf_so
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_so
ret = -EINVAL;
}
}
-#else
ret = -EINVAL;
#endif
} else {