diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-06-25 19:30:15 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-06-25 19:30:15 +0000 |
| commit | 5385b6be1e80d14746766df036a20d55d91a0bb8 (patch) | |
| tree | ccd6000941ca466c192c45ea1fe4614dbd5eb894 /pkg/tcpip/stack | |
| parent | d0f6600dbcec70bdf52c9a2e18a2bbccf42bcbae (diff) | |
| parent | f00077e8d8d59ee6db93a3ece24c5f3f5156eda5 (diff) | |
Merge release-20210614.0-32-gf00077e8d (automated)
Diffstat (limited to 'pkg/tcpip/stack')
| -rw-r--r-- | pkg/tcpip/stack/stack_state_autogen.go | 11 | ||||
| -rw-r--r-- | pkg/tcpip/stack/tcp.go | 3 |
2 files changed, 4 insertions, 10 deletions
diff --git a/pkg/tcpip/stack/stack_state_autogen.go b/pkg/tcpip/stack/stack_state_autogen.go index b287f64c3..47c7e386e 100644 --- a/pkg/tcpip/stack/stack_state_autogen.go +++ b/pkg/tcpip/stack/stack_state_autogen.go @@ -1045,7 +1045,6 @@ func (t *TCPSndBufState) StateFields() []string { "SndBufSize", "SndBufUsed", "SndClosed", - "SndBufInQueue", "PacketTooBigCount", "SndMTU", } @@ -1059,9 +1058,8 @@ func (t *TCPSndBufState) StateSave(stateSinkObject state.Sink) { stateSinkObject.Save(0, &t.SndBufSize) stateSinkObject.Save(1, &t.SndBufUsed) stateSinkObject.Save(2, &t.SndClosed) - stateSinkObject.Save(3, &t.SndBufInQueue) - stateSinkObject.Save(4, &t.PacketTooBigCount) - stateSinkObject.Save(5, &t.SndMTU) + stateSinkObject.Save(3, &t.PacketTooBigCount) + stateSinkObject.Save(4, &t.SndMTU) } func (t *TCPSndBufState) afterLoad() {} @@ -1071,9 +1069,8 @@ func (t *TCPSndBufState) StateLoad(stateSourceObject state.Source) { stateSourceObject.Load(0, &t.SndBufSize) stateSourceObject.Load(1, &t.SndBufUsed) stateSourceObject.Load(2, &t.SndClosed) - stateSourceObject.Load(3, &t.SndBufInQueue) - stateSourceObject.Load(4, &t.PacketTooBigCount) - stateSourceObject.Load(5, &t.SndMTU) + stateSourceObject.Load(3, &t.PacketTooBigCount) + stateSourceObject.Load(4, &t.SndMTU) } func (t *TCPEndpointStateInner) StateTypeName() string { diff --git a/pkg/tcpip/stack/tcp.go b/pkg/tcpip/stack/tcp.go index e90c1a770..90a8ba6cf 100644 --- a/pkg/tcpip/stack/tcp.go +++ b/pkg/tcpip/stack/tcp.go @@ -380,9 +380,6 @@ type TCPSndBufState struct { // SndClosed indicates that the endpoint has been closed for sends. SndClosed bool - // SndBufInQueue is the number of bytes in the send queue. - SndBufInQueue seqnum.Size - // PacketTooBigCount is used to notify the main protocol routine how // many times a "packet too big" control packet is received. PacketTooBigCount int |