summaryrefslogtreecommitdiffhomepage
path: root/pkg/tcpip/link/qdisc/fifo
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-07-15 21:19:41 +0000
committergVisor bot <gvisor-bot@google.com>2020-07-15 21:19:41 +0000
commitbb4615b663db81e5bd035c50661080d6645ac717 (patch)
tree4618e56ef3e5411174428c0dce3cf729ec888ebe /pkg/tcpip/link/qdisc/fifo
parentf7dca07b3a30d251c0b187ce3e600b7b3cda14e4 (diff)
parentfef90c61c6186c113cfdb0bbcf53f4ca70f9741a (diff)
Merge release-20200622.1-162-gfef90c61c (automated)
Diffstat (limited to 'pkg/tcpip/link/qdisc/fifo')
-rw-r--r--pkg/tcpip/link/qdisc/fifo/endpoint.go6
1 files changed, 6 insertions, 0 deletions
diff --git a/pkg/tcpip/link/qdisc/fifo/endpoint.go b/pkg/tcpip/link/qdisc/fifo/endpoint.go
index b5dfb7850..c84fe1bb9 100644
--- a/pkg/tcpip/link/qdisc/fifo/endpoint.go
+++ b/pkg/tcpip/link/qdisc/fifo/endpoint.go
@@ -22,6 +22,7 @@ import (
"gvisor.dev/gvisor/pkg/sync"
"gvisor.dev/gvisor/pkg/tcpip"
"gvisor.dev/gvisor/pkg/tcpip/buffer"
+ "gvisor.dev/gvisor/pkg/tcpip/header"
"gvisor.dev/gvisor/pkg/tcpip/stack"
)
@@ -207,3 +208,8 @@ func (e *endpoint) Wait() {
e.wg.Wait()
}
+
+// ARPHardwareType implements stack.LinkEndpoint.ARPHardwareType
+func (e *endpoint) ARPHardwareType() header.ARPHardwareType {
+ return e.lower.ARPHardwareType()
+}