diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2024-08-16 19:43:16 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2024-08-16 19:43:16 -0300 |
| commit | 3bce87eb744f1f88523a118e10e0deebf31806ec (patch) | |
| tree | 02f9090ff510c97ce442a07b807615ad00f1406b /tools/testing/selftests/net/af_unix/msg_oob.c | |
| parent | 2615639352420e6e3115952c5b8f46846e1c6d0e (diff) | |
| parent | 85652baa895b59b94bea29c77cb9b51cf7120deb (diff) | |
Merge remote-tracking branch 'torvalds/master' into perf-tools-next
To pick up the latest perf-tools merge for 6.11, i.e. to have the
current perf tools branch that is getting into 6.11 with the
perf-tools-next that is geared towards 6.12.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/testing/selftests/net/af_unix/msg_oob.c')
| -rw-r--r-- | tools/testing/selftests/net/af_unix/msg_oob.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/net/af_unix/msg_oob.c b/tools/testing/selftests/net/af_unix/msg_oob.c index 16d0c172eaeb..535eb2c3d7d1 100644 --- a/tools/testing/selftests/net/af_unix/msg_oob.c +++ b/tools/testing/selftests/net/af_unix/msg_oob.c @@ -209,7 +209,7 @@ static void __sendpair(struct __test_metadata *_metadata, static void __recvpair(struct __test_metadata *_metadata, FIXTURE_DATA(msg_oob) *self, - const void *expected_buf, int expected_len, + const char *expected_buf, int expected_len, int buf_len, int flags) { int i, ret[2], recv_errno[2], expected_errno = 0; |