diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-08-19 06:16:49 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-08-19 06:16:49 +0200 |
| commit | ca7df2c7bb5f83fe46aa9ce998b7352c6b28f3a1 (patch) | |
| tree | f0304a9068bea0b80ba7ed07c0192927c6fcea8f /tools/testing/selftests/net/af_unix/msg_oob.c | |
| parent | 82313624b2ae5a943d16475a566b65c873989e9f (diff) | |
| parent | 47ac09b91befbb6a235ab620c32af719f8208399 (diff) | |
Merge 6.11-rc4 into usb-next
We need the usb / thunderbolt fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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; |