diff options
| author |   Alexei Starovoitov <ast@kernel.org> | 2018-08-08 12:06:18 -0700 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2018-08-08 12:06:18 -0700 |
| commit | bf9bae0ea6ec7013ef37b19fbbf29b62a35474fb (patch) | |
| tree | f9f065f65726c9f51b21051ea0c003fbaac5706d /tools | |
| parent | bpf: btf: Change tools/lib/bpf/btf to LGPL (diff) | |
| parent | bpf, sockmap: fix cork timeout for select due to epipe (diff) | |
| download | wireguard-linux-bf9bae0ea6ec7013ef37b19fbbf29b62a35474fb.tar.xz wireguard-linux-bf9bae0ea6ec7013ef37b19fbbf29b62a35474fb.zip | |
Merge branch 'sockmap-fixes'
Daniel Borkmann says:
====================
Two sockmap fixes in bpf_tcp_sendmsg(), and one fix for the
sockmap kernel selftest. Thanks!
====================
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/testing/selftests/bpf/test_sockmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/bpf/test_sockmap.c b/tools/testing/selftests/bpf/test_sockmap.c index 9e78df207919..0c7d9e556b47 100644 --- 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; |