diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-01-10 06:14:54 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-01-10 06:14:54 +0000 |
| commit | d09b1da02d67a8a51f1b41e0a8e9026218ffa20a (patch) | |
| tree | b32df508ac0b9087e3319a1d2b33dfbb86db8ad1 /pkg/tcpip/network | |
| parent | aca2ac5c956a7542eebf50806b0e0171c8caa816 (diff) | |
| parent | 27500d529f7fb87eef8812278fd1bbca67bcba72 (diff) | |
Merge release-20191213.0-96-g27500d5 (automated)
Diffstat (limited to 'pkg/tcpip/network')
| -rw-r--r-- | pkg/tcpip/network/fragmentation/fragmentation.go | 2 | ||||
| -rw-r--r-- | pkg/tcpip/network/fragmentation/reassembler.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkg/tcpip/network/fragmentation/fragmentation.go b/pkg/tcpip/network/fragmentation/fragmentation.go index 6da5238ec..92f2aa13a 100644 --- a/pkg/tcpip/network/fragmentation/fragmentation.go +++ b/pkg/tcpip/network/fragmentation/fragmentation.go @@ -19,9 +19,9 @@ package fragmentation import ( "fmt" "log" - "sync" "time" + "gvisor.dev/gvisor/pkg/sync" "gvisor.dev/gvisor/pkg/tcpip/buffer" ) diff --git a/pkg/tcpip/network/fragmentation/reassembler.go b/pkg/tcpip/network/fragmentation/reassembler.go index 9e002e396..0a83d81f2 100644 --- a/pkg/tcpip/network/fragmentation/reassembler.go +++ b/pkg/tcpip/network/fragmentation/reassembler.go @@ -18,9 +18,9 @@ import ( "container/heap" "fmt" "math" - "sync" "time" + "gvisor.dev/gvisor/pkg/sync" "gvisor.dev/gvisor/pkg/tcpip/buffer" ) |