diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-09-03 01:24:50 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-09-03 01:24:50 +0000 |
| commit | ba2b04392c3b72ce9684564f57c59a6a88c8c8a7 (patch) | |
| tree | e2da6f22c92cc382ad072e1e81e3003c66bb8efd /pkg/tcpip/adapters | |
| parent | 2aae647465e5d427ca3d427049310d3b26e796f0 (diff) | |
| parent | b69352245ab729cc01088c8258a3167f069bd684 (diff) | |
Merge release-20200818.0-115-gb69352245 (automated)
Diffstat (limited to 'pkg/tcpip/adapters')
| -rw-r--r-- | pkg/tcpip/adapters/gonet/gonet.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/tcpip/adapters/gonet/gonet.go b/pkg/tcpip/adapters/gonet/gonet.go index 68a954a10..4f551cd92 100644 --- a/pkg/tcpip/adapters/gonet/gonet.go +++ b/pkg/tcpip/adapters/gonet/gonet.go @@ -245,7 +245,7 @@ func NewTCPConn(wq *waiter.Queue, ep tcpip.Endpoint) *TCPConn { // Accept implements net.Conn.Accept. func (l *TCPListener) Accept() (net.Conn, error) { - n, wq, err := l.ep.Accept() + n, wq, err := l.ep.Accept(nil) if err == tcpip.ErrWouldBlock { // Create wait queue entry that notifies a channel. @@ -254,7 +254,7 @@ func (l *TCPListener) Accept() (net.Conn, error) { defer l.wq.EventUnregister(&waitEntry) for { - n, wq, err = l.ep.Accept() + n, wq, err = l.ep.Accept(nil) if err != tcpip.ErrWouldBlock { break |