summaryrefslogtreecommitdiffhomepage
path: root/pkg/tcpip/transport/tcp
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-03-20 22:27:41 +0000
committergVisor bot <gvisor-bot@google.com>2020-03-20 22:27:41 +0000
commit9e8fb9c5b53b2b4c035229e3f4ca1c38da41cca1 (patch)
treeef45bf74f7cf136a6ee5e16c81a93668382da126 /pkg/tcpip/transport/tcp
parentebbc1e44f38b7b9710b7ac85f7da9c0f9bce2c3a (diff)
parent49aef9cee70d111f6c3e1a6b04430bbe414a6c1e (diff)
Merge release-20200219.0-212-g49aef9c (automated)
Diffstat (limited to 'pkg/tcpip/transport/tcp')
-rw-r--r--pkg/tcpip/transport/tcp/connect.go1
-rw-r--r--pkg/tcpip/transport/tcp/snd.go5
-rwxr-xr-xpkg/tcpip/transport/tcp/tcp_state_autogen.go2
3 files changed, 0 insertions, 8 deletions
diff --git a/pkg/tcpip/transport/tcp/connect.go b/pkg/tcpip/transport/tcp/connect.go
index edb37a549..53193afc6 100644
--- a/pkg/tcpip/transport/tcp/connect.go
+++ b/pkg/tcpip/transport/tcp/connect.go
@@ -878,7 +878,6 @@ func (e *endpoint) handleWrite() *tcpip.Error {
first := e.sndQueue.Front()
if first != nil {
e.snd.writeList.PushBackList(&e.sndQueue)
- e.snd.sndNxtList.UpdateForward(e.sndBufInQueue)
e.sndBufInQueue = 0
}
diff --git a/pkg/tcpip/transport/tcp/snd.go b/pkg/tcpip/transport/tcp/snd.go
index 17fed4ec5..6b7bac37d 100644
--- a/pkg/tcpip/transport/tcp/snd.go
+++ b/pkg/tcpip/transport/tcp/snd.go
@@ -126,10 +126,6 @@ type sender struct {
// sndNxt is the sequence number of the next segment to be sent.
sndNxt seqnum.Value
- // sndNxtList is the sequence number of the next segment to be added to
- // the send list.
- sndNxtList seqnum.Value
-
// rttMeasureSeqNum is the sequence number being used for the latest RTT
// measurement.
rttMeasureSeqNum seqnum.Value
@@ -229,7 +225,6 @@ func newSender(ep *endpoint, iss, irs seqnum.Value, sndWnd seqnum.Size, mss uint
sndWnd: sndWnd,
sndUna: iss + 1,
sndNxt: iss + 1,
- sndNxtList: iss + 1,
rto: 1 * time.Second,
rttMeasureSeqNum: iss + 1,
lastSendTime: time.Now(),
diff --git a/pkg/tcpip/transport/tcp/tcp_state_autogen.go b/pkg/tcpip/transport/tcp/tcp_state_autogen.go
index 888392e56..253582533 100755
--- a/pkg/tcpip/transport/tcp/tcp_state_autogen.go
+++ b/pkg/tcpip/transport/tcp/tcp_state_autogen.go
@@ -364,7 +364,6 @@ func (x *sender) save(m state.Map) {
m.Save("sndWnd", &x.sndWnd)
m.Save("sndUna", &x.sndUna)
m.Save("sndNxt", &x.sndNxt)
- m.Save("sndNxtList", &x.sndNxtList)
m.Save("rttMeasureSeqNum", &x.rttMeasureSeqNum)
m.Save("closed", &x.closed)
m.Save("writeNext", &x.writeNext)
@@ -390,7 +389,6 @@ func (x *sender) load(m state.Map) {
m.Load("sndWnd", &x.sndWnd)
m.Load("sndUna", &x.sndUna)
m.Load("sndNxt", &x.sndNxt)
- m.Load("sndNxtList", &x.sndNxtList)
m.Load("rttMeasureSeqNum", &x.rttMeasureSeqNum)
m.Load("closed", &x.closed)
m.Load("writeNext", &x.writeNext)