summaryrefslogtreecommitdiffhomepage
path: root/pkg/tcpip/link/fdbased
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2019-07-30 18:09:41 +0000
committergVisor bot <gvisor-bot@google.com>2019-07-30 18:09:41 +0000
commit3d4eebfac23658dcb2ae23de9f7ba2426383a111 (patch)
tree52ec95d2319e5897e7beb2a7738e02cdb9601fdd /pkg/tcpip/link/fdbased
parent30b95562998aa74463b9cd75b4945b5c6c882f95 (diff)
parent1decf764718f66097ce5bbfe2cd14a883a4ef713 (diff)
Merge 1decf764 (automated)
Diffstat (limited to 'pkg/tcpip/link/fdbased')
-rw-r--r--pkg/tcpip/link/fdbased/mmap_amd64.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/tcpip/link/fdbased/mmap_amd64.go b/pkg/tcpip/link/fdbased/mmap_amd64.go
index 8bbb4f9ab..029f86a18 100644
--- a/pkg/tcpip/link/fdbased/mmap_amd64.go
+++ b/pkg/tcpip/link/fdbased/mmap_amd64.go
@@ -134,7 +134,7 @@ func (d *packetMMapDispatcher) readMMappedPacket() ([]byte, *tcpip.Error) {
FD: int32(d.fd),
Events: unix.POLLIN | unix.POLLERR,
}
- if _, errno := rawfile.BlockingPoll(&event, 1, -1); errno != 0 {
+ if _, errno := rawfile.BlockingPoll(&event, 1, nil); errno != 0 {
if errno == syscall.EINTR {
continue
}