diff options
author | gVisor bot <gvisor-bot@google.com> | 2020-05-07 20:23:43 +0000 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2020-05-07 20:23:43 +0000 |
commit | 03a34f6ddde4ba3c45ace56a6328bf85197625b4 (patch) | |
tree | 680396b6e1b7929a44632681eb89b18b19b458ab /pkg/tcpip/link | |
parent | 03daf4f9759e35beea2663b171f134fc48dde512 (diff) | |
parent | 1f4087e7cd6c3cc696e6b26446abd6c5214cfd67 (diff) |
Merge release-20200422.0-51-g1f4087e (automated)
Diffstat (limited to 'pkg/tcpip/link')
8 files changed, 26 insertions, 9 deletions
diff --git a/pkg/tcpip/link/fdbased/fdbased_state_autogen.go b/pkg/tcpip/link/fdbased/fdbased_state_autogen.go index 97cb3958e..b84e8f21c 100755 --- a/pkg/tcpip/link/fdbased/fdbased_state_autogen.go +++ b/pkg/tcpip/link/fdbased/fdbased_state_autogen.go @@ -1,10 +1,8 @@ // automatically generated by stateify. // +build linux -// +build linux // +build linux,amd64 linux,arm64 // +build !linux !amd64,!arm64 -// +build linux,amd64 linux,arm64 // +build linux package fdbased diff --git a/pkg/tcpip/link/fdbased/fdbased_unsafe_state_autogen.go b/pkg/tcpip/link/fdbased/fdbased_unsafe_state_autogen.go new file mode 100755 index 000000000..e2ed505b2 --- /dev/null +++ b/pkg/tcpip/link/fdbased/fdbased_unsafe_state_autogen.go @@ -0,0 +1,6 @@ +// automatically generated by stateify. + +// +build linux +// +build linux,amd64 linux,arm64 + +package fdbased diff --git a/pkg/tcpip/link/rawfile/rawfile_state_autogen.go b/pkg/tcpip/link/rawfile/rawfile_state_autogen.go index 6b6816bae..338e9679b 100755 --- a/pkg/tcpip/link/rawfile/rawfile_state_autogen.go +++ b/pkg/tcpip/link/rawfile/rawfile_state_autogen.go @@ -1,10 +1,5 @@ // automatically generated by stateify. -// +build linux,!amd64,!arm64 -// +build linux,amd64 linux,arm64 -// +build go1.12 -// +build !go1.15 -// +build linux // +build linux package rawfile diff --git a/pkg/tcpip/link/rawfile/rawfile_unsafe_state_autogen.go b/pkg/tcpip/link/rawfile/rawfile_unsafe_state_autogen.go new file mode 100755 index 000000000..70d62c4a1 --- /dev/null +++ b/pkg/tcpip/link/rawfile/rawfile_unsafe_state_autogen.go @@ -0,0 +1,9 @@ +// automatically generated by stateify. + +// +build linux,!amd64,!arm64 +// +build linux,amd64 linux,arm64 +// +build go1.12 +// +build !go1.15 +// +build linux + +package rawfile diff --git a/pkg/tcpip/link/sharedmem/pipe/pipe_unsafe_state_autogen.go b/pkg/tcpip/link/sharedmem/pipe/pipe_unsafe_state_autogen.go new file mode 100755 index 000000000..d3b40feb4 --- /dev/null +++ b/pkg/tcpip/link/sharedmem/pipe/pipe_unsafe_state_autogen.go @@ -0,0 +1,3 @@ +// automatically generated by stateify. + +package pipe diff --git a/pkg/tcpip/link/sharedmem/sharedmem_unsafe_state_autogen.go b/pkg/tcpip/link/sharedmem/sharedmem_unsafe_state_autogen.go new file mode 100755 index 000000000..ac3a66520 --- /dev/null +++ b/pkg/tcpip/link/sharedmem/sharedmem_unsafe_state_autogen.go @@ -0,0 +1,3 @@ +// automatically generated by stateify. + +package sharedmem diff --git a/pkg/tcpip/link/tun/tun_state_autogen.go b/pkg/tcpip/link/tun/tun_state_autogen.go index 8b56175e4..4b70647af 100755 --- a/pkg/tcpip/link/tun/tun_state_autogen.go +++ b/pkg/tcpip/link/tun/tun_state_autogen.go @@ -1,7 +1,5 @@ // automatically generated by stateify. -// +build linux - package tun import ( diff --git a/pkg/tcpip/link/tun/tun_unsafe_state_autogen.go b/pkg/tcpip/link/tun/tun_unsafe_state_autogen.go new file mode 100755 index 000000000..149299ea3 --- /dev/null +++ b/pkg/tcpip/link/tun/tun_unsafe_state_autogen.go @@ -0,0 +1,5 @@ +// automatically generated by stateify. + +// +build linux + +package tun |