Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net

2018-08-11 17:52:00 -07:00
parent 9a95d9c642 ec0c96714e
commit 6a92ef08a1
19 changed files with 92 additions and 71 deletions
--- a/tools/testing/selftests/bpf/test_sockmap.c
+++ b/tools/testing/selftests/bpf/test_sockmap.c
@@ -354,7 +354,7 @@ static int msg_loop(int fd, int iov_count, int iov_length, int cnt,
 		while (s->bytes_recvd < total_bytes) {
 			if (txmsg_cork) {
 				timeout.tv_sec = 0;
-				timeout.tv_usec = 1000;
+				timeout.tv_usec = 300000;
 			} else {
 				timeout.tv_sec = 1;
 				timeout.tv_usec = 0;