summaryrefslogtreecommitdiffhomepage
path: root/pkg/tcpip/network/fragmentation/reassembler.go
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-01-10 06:14:54 +0000
committergVisor bot <gvisor-bot@google.com>2020-01-10 06:14:54 +0000
commitd09b1da02d67a8a51f1b41e0a8e9026218ffa20a (patch)
treeb32df508ac0b9087e3319a1d2b33dfbb86db8ad1 /pkg/tcpip/network/fragmentation/reassembler.go
parentaca2ac5c956a7542eebf50806b0e0171c8caa816 (diff)
parent27500d529f7fb87eef8812278fd1bbca67bcba72 (diff)
Merge release-20191213.0-96-g27500d5 (automated)
Diffstat (limited to 'pkg/tcpip/network/fragmentation/reassembler.go')
-rw-r--r--pkg/tcpip/network/fragmentation/reassembler.go2
1 files changed, 1 insertions, 1 deletions
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"
)