diff options
| author | Kevin Krakauer <krakauer@google.com> | 2019-06-12 15:21:22 -0700 |
|---|---|---|
| committer | Kevin Krakauer <krakauer@google.com> | 2019-06-12 15:21:22 -0700 |
| commit | 0bbbcafd68154e7c7b46692b84a39fb6bb5f1568 (patch) | |
| tree | d8fba01ad76900715665b0418a786de2d77e2a05 /pkg/tcpip/transport/tcp/segment_queue.go | |
| parent | 06a83df533244dc2b3b8adfc1bf0608d3753c1d9 (diff) | |
| parent | 70578806e8d3e01fae2249b3e602cd5b05d378a0 (diff) | |
Merge branch 'master' into iptables-1-pkg
Change-Id: I7457a11de4725e1bf3811420c505d225b1cb6943
Diffstat (limited to 'pkg/tcpip/transport/tcp/segment_queue.go')
| -rw-r--r-- | pkg/tcpip/transport/tcp/segment_queue.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkg/tcpip/transport/tcp/segment_queue.go b/pkg/tcpip/transport/tcp/segment_queue.go index 3b020e580..e0759225e 100644 --- a/pkg/tcpip/transport/tcp/segment_queue.go +++ b/pkg/tcpip/transport/tcp/segment_queue.go @@ -16,8 +16,6 @@ package tcp import ( "sync" - - "gvisor.googlesource.com/gvisor/pkg/tcpip/header" ) // segmentQueue is a bounded, thread-safe queue of TCP segments. @@ -58,7 +56,7 @@ func (q *segmentQueue) enqueue(s *segment) bool { r := q.used < q.limit if r { q.list.PushBack(s) - q.used += s.data.Size() + header.TCPMinimumSize + q.used++ } q.mu.Unlock() @@ -73,7 +71,7 @@ func (q *segmentQueue) dequeue() *segment { s := q.list.Front() if s != nil { q.list.Remove(s) - q.used -= s.data.Size() + header.TCPMinimumSize + q.used-- } q.mu.Unlock() |