diff options
| author | Thomas Gleixner <[email protected]> | 2024-08-02 14:10:55 +0200 |
|---|---|---|
| committer | Thomas Gleixner <[email protected]> | 2024-08-02 14:10:55 +0200 |
| commit | 4436e6da008fee87d54c038e983e5be9a6baf8fb (patch) | |
| tree | 265a15efcf6f17e0e32e258d66b274fc5cad41d4 /tools/testing/selftests/bpf/prog_tests/sockopt_inherit.c | |
| parent | b7c35279e0da414e7d90eba76f58a16223a734cb (diff) | |
| parent | 8400291e289ee6b2bf9779ff1c83a291501f017b (diff) | |
Merge branch 'linus' into x86/mm
Bring x86 and selftests up to date
Diffstat (limited to 'tools/testing/selftests/bpf/prog_tests/sockopt_inherit.c')
| -rw-r--r-- | tools/testing/selftests/bpf/prog_tests/sockopt_inherit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/bpf/prog_tests/sockopt_inherit.c b/tools/testing/selftests/bpf/prog_tests/sockopt_inherit.c index 1d3a20f01b60..7cd8be2780ca 100644 --- a/tools/testing/selftests/bpf/prog_tests/sockopt_inherit.c +++ b/tools/testing/selftests/bpf/prog_tests/sockopt_inherit.c @@ -70,7 +70,7 @@ static void *server_thread(void *arg) return (void *)(long)err; } -static int custom_cb(int fd, const struct post_socket_opts *opts) +static int custom_cb(int fd, void *opts) { char buf; int err; |