summaryrefslogtreecommitdiffhomepage
path: root/pkg/tcpip/transport/packet
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-12-11 18:40:22 +0000
committergVisor bot <gvisor-bot@google.com>2020-12-11 18:40:22 +0000
commite643a3498e5e1f80410cb4eaeb3d1b335095074e (patch)
tree6a7e5876cf8a6550b95892a3fb3c98d3abbe6067 /pkg/tcpip/transport/packet
parentd85e8f86be2fcd18b198b8ac65a61200c0f92317 (diff)
parentaf4afdc0e0482fd6f4d6d8da77df30527b75e421 (diff)
Merge release-20201208.0-28-gaf4afdc0e (automated)
Diffstat (limited to 'pkg/tcpip/transport/packet')
-rw-r--r--pkg/tcpip/transport/packet/endpoint.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/tcpip/transport/packet/endpoint.go b/pkg/tcpip/transport/packet/endpoint.go
index 3666bac0f..1e7debbb4 100644
--- a/pkg/tcpip/transport/packet/endpoint.go
+++ b/pkg/tcpip/transport/packet/endpoint.go
@@ -206,8 +206,8 @@ func (*endpoint) Write(p tcpip.Payloader, opts tcpip.WriteOptions) (int64, <-cha
}
// Peek implements tcpip.Endpoint.Peek.
-func (*endpoint) Peek([][]byte) (int64, tcpip.ControlMessages, *tcpip.Error) {
- return 0, tcpip.ControlMessages{}, nil
+func (*endpoint) Peek([][]byte) (int64, *tcpip.Error) {
+ return 0, nil
}
// Disconnect implements tcpip.Endpoint.Disconnect. Packet sockets cannot be