From: Willem de Bruijn <will...@google.com>
The msg_zerocopy test defines SO_ZEROCOPY if necessary, but its value
is inconsistent with the one in asm-generic.h. Correct that.
Also convert one error to a warning. When the test is complete, report
throughput and close cleanly even if the process did not wait for all
completions.
Reported-by: Dan Melnic <d...@fb.com>
Signed-off-by: Willem de Bruijn <will...@google.com>
---
tools/testing/selftests/net/msg_zerocopy.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/testing/selftests/net/msg_zerocopy.c
b/tools/testing/selftests/net/msg_zerocopy.c
index 448c69a8af74..40232af5b023 100644
--- a/tools/testing/selftests/net/msg_zerocopy.c
+++ b/tools/testing/selftests/net/msg_zerocopy.c
@@ -59,7 +59,7 @@
#endif
#ifndef SO_ZEROCOPY
-#define SO_ZEROCOPY 59
+#define SO_ZEROCOPY 60
#endif
#ifndef SO_EE_CODE_ZEROCOPY_COPIED
@@ -382,8 +382,8 @@ static void do_recv_remaining_completions(int fd)
}
if (completions < expected_completions)
- error(1, 0, "missing notifications: %lu < %lu\n",
- completions, expected_completions);
+ fprintf(stderr, "missing notifications: %lu < %lu\n",
+ completions, expected_completions);
}
static void do_tx(int domain, int type, int protocol)
--
2.14.1.581.gf28d330327-goog
