diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-12-11 18:40:22 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-12-11 18:40:22 +0000 |
| commit | e643a3498e5e1f80410cb4eaeb3d1b335095074e (patch) | |
| tree | 6a7e5876cf8a6550b95892a3fb3c98d3abbe6067 /pkg/tcpip/transport/icmp | |
| parent | d85e8f86be2fcd18b198b8ac65a61200c0f92317 (diff) | |
| parent | af4afdc0e0482fd6f4d6d8da77df30527b75e421 (diff) | |
Merge release-20201208.0-28-gaf4afdc0e (automated)
Diffstat (limited to 'pkg/tcpip/transport/icmp')
| -rw-r--r-- | pkg/tcpip/transport/icmp/endpoint.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/tcpip/transport/icmp/endpoint.go b/pkg/tcpip/transport/icmp/endpoint.go index 94fcd72d9..80c01f2cb 100644 --- a/pkg/tcpip/transport/icmp/endpoint.go +++ b/pkg/tcpip/transport/icmp/endpoint.go @@ -332,8 +332,8 @@ func (e *endpoint) write(p tcpip.Payloader, opts tcpip.WriteOptions) (int64, <-c } // Peek only returns data from a single datagram, so do nothing here. -func (e *endpoint) Peek([][]byte) (int64, tcpip.ControlMessages, *tcpip.Error) { - return 0, tcpip.ControlMessages{}, nil +func (e *endpoint) Peek([][]byte) (int64, *tcpip.Error) { + return 0, nil } // SetSockOpt sets a socket option. |