bpf: fix to bpf_setsockops

Lawrence Brakmo · davem330 · commit a5192c52377e · 2017-07-02T15:16:52.000-07:00
Fixed build error due to misplaced "#ifdef CONFIG_INET" (moved 1
statement up).

Signed-off-by: Lawrence Brakmo &lt;brakmo@fb.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git 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 {

Original file line number	Diff line number	Diff line change
`@@ -2717,9 +2717,9 @@ BPF_CALL_5(bpf_setsockopt, struct bpf_sock_ops_kern *, bpf_sock,`
`2717`	`2717`	`default:`
`2718`	`2718`	`ret = -EINVAL;`
`2719`	`2719`	`}`
	`2720`	`+#ifdef CONFIG_INET`
`2720`	`2721`	`} else if (level == SOL_TCP &&`
`2721`	`2722`	`sk->sk_prot->setsockopt == tcp_setsockopt) {`
`2722`		`-#ifdef CONFIG_INET`
`2723`	`2723`	`if (optname == TCP_CONGESTION) {`
`2724`	`2724`	`char name[TCP_CA_NAME_MAX];`
`2725`	`2725`
`@@ -2757,7 +2757,6 @@ BPF_CALL_5(bpf_setsockopt, struct bpf_sock_ops_kern *, bpf_sock,`
`2757`	`2757`	`ret = -EINVAL;`
`2758`	`2758`	`}`
`2759`	`2759`	`}`
`2760`		`-#else`
`2761`	`2760`	`ret = -EINVAL;`
`2762`	`2761`	`#endif`
`2763`	`2762`	`} else {`