diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-03-23 20:52:56 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-03-23 20:53:49 +0300 |
| commit | 89695196f0ba78a17453f9616355f2ca6b293402 (patch) | |
| tree | 7a0f44d06e5b83002899667841baa9a3598bf819 /tools/testing/selftests/net/af_unix/test_unix_oob.c | |
| parent | 764f4eb6846f5475f1244767d24d25dd86528a4a (diff) | |
| parent | f92fcb5c00dc924a4661d5bf68de7937040f26b8 (diff) | |
| download | linux-89695196f0ba78a17453f9616355f2ca6b293402.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Merge in overtime fixes, no conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'tools/testing/selftests/net/af_unix/test_unix_oob.c')
| -rw-r--r-- | tools/testing/selftests/net/af_unix/test_unix_oob.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/testing/selftests/net/af_unix/test_unix_oob.c b/tools/testing/selftests/net/af_unix/test_unix_oob.c index 3dece8b29253..b57e91e1c3f2 100644 --- a/tools/testing/selftests/net/af_unix/test_unix_oob.c +++ b/tools/testing/selftests/net/af_unix/test_unix_oob.c @@ -218,10 +218,10 @@ main(int argc, char **argv) /* Test 1: * veriyf that SIGURG is - * delivered and 63 bytes are - * read and oob is '@' + * delivered, 63 bytes are + * read, oob is '@', and POLLPRI works. */ - wait_for_data(pfd, POLLIN | POLLPRI); + wait_for_data(pfd, POLLPRI); read_oob(pfd, &oob); len = read_data(pfd, buf, 1024); if (!signal_recvd || len != 63 || oob != '@') { |