Skip to content

Commit dcd785a

Browse files
ExtremeXTduhansysl
authored andcommitted
bpf: minor fixes
1 parent a52083e commit dcd785a

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

include/uapi/linux/bpf.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1077,10 +1077,6 @@ struct bpf_cgroup_dev_ctx {
10771077
__u32 minor;
10781078
};
10791079

1080-
struct bpf_raw_tracepoint_args {
1081-
__u64 args[0];
1082-
};
1083-
10841080
struct bpf_sysctl {
10851081
__u32 write; /* Sysctl is being read (= 0) or written (= 1).
10861082
* Allows 1,2,4-byte read, but no write.

net/core/filter.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3182,7 +3182,7 @@ sock_addr_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
31823182
}
31833183

31843184
static const struct bpf_func_proto *
3185-
sock_filter_func_proto(enum bpf_func_id func_id)
3185+
sock_filter_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
31863186
{
31873187
switch (func_id) {
31883188
/* inet and inet6 sockets are created in a process
@@ -3191,7 +3191,7 @@ sock_filter_func_proto(enum bpf_func_id func_id)
31913191
case BPF_FUNC_get_current_uid_gid:
31923192
return &bpf_get_current_uid_gid_proto;
31933193
default:
3194-
return bpf_base_func_proto(func_id);
3194+
return bpf_base_func_proto(func_id, NULL);
31953195
}
31963196
}
31973197

0 commit comments

Comments
 (0)