Merge release-20210726.0-57-g3416a3db7 (automated)

6 files changed, 26 insertions, 13 deletions

diff --git a/pkg/tcpip/stack/stack_state_autogen.go b/pkg/tcpip/stack/stack_state_autogen.go
index 037c7b745..54f2574ac 100644
--- a/pkg/tcpip/stack/stack_state_autogen.go
+++ b/pkg/tcpip/stack/stack_state_autogen.go
@@ -100,7 +100,8 @@ func (cn *conn) beforeSave() {}
 // +checklocksignore
 func (cn *conn) StateSave(stateSinkObject state.Sink) {
 	cn.beforeSave()
-	var lastUsedValue unixTime = cn.saveLastUsed()
+	var lastUsedValue unixTime
+	lastUsedValue = cn.saveLastUsed()
 	stateSinkObject.SaveValue(5, lastUsedValue)
 	stateSinkObject.Save(0, &cn.original)
 	stateSinkObject.Save(1, &cn.reply)
diff --git a/pkg/tcpip/transport/icmp/icmp_state_autogen.go b/pkg/tcpip/transport/icmp/icmp_state_autogen.go
index acfc8ff5f..d90b76d9c 100644
--- a/pkg/tcpip/transport/icmp/icmp_state_autogen.go
+++ b/pkg/tcpip/transport/icmp/icmp_state_autogen.go
@@ -25,9 +25,11 @@ func (p *icmpPacket) beforeSave() {}
 // +checklocksignore
 func (p *icmpPacket) StateSave(stateSinkObject state.Sink) {
 	p.beforeSave()
-	var dataValue buffer.VectorisedView = p.saveData()
+	var dataValue buffer.VectorisedView
+	dataValue = p.saveData()
 	stateSinkObject.SaveValue(2, dataValue)
-	var receivedAtValue int64 = p.saveReceivedAt()
+	var receivedAtValue int64
+	receivedAtValue = p.saveReceivedAt()
 	stateSinkObject.SaveValue(3, receivedAtValue)
 	stateSinkObject.Save(0, &p.icmpPacketEntry)
 	stateSinkObject.Save(1, &p.senderAddress)
diff --git a/pkg/tcpip/transport/packet/packet_state_autogen.go b/pkg/tcpip/transport/packet/packet_state_autogen.go
index 304f67c12..2640a55d0 100644
--- a/pkg/tcpip/transport/packet/packet_state_autogen.go
+++ b/pkg/tcpip/transport/packet/packet_state_autogen.go
@@ -26,9 +26,11 @@ func (p *packet) beforeSave() {}
 // +checklocksignore
 func (p *packet) StateSave(stateSinkObject state.Sink) {
 	p.beforeSave()
-	var dataValue buffer.VectorisedView = p.saveData()
+	var dataValue buffer.VectorisedView
+	dataValue = p.saveData()
 	stateSinkObject.SaveValue(1, dataValue)
-	var receivedAtValue int64 = p.saveReceivedAt()
+	var receivedAtValue int64
+	receivedAtValue = p.saveReceivedAt()
 	stateSinkObject.SaveValue(2, receivedAtValue)
 	stateSinkObject.Save(0, &p.packetEntry)
 	stateSinkObject.Save(3, &p.senderAddr)
diff --git a/pkg/tcpip/transport/raw/raw_state_autogen.go b/pkg/tcpip/transport/raw/raw_state_autogen.go
index aaeed9775..0d65444d2 100644
--- a/pkg/tcpip/transport/raw/raw_state_autogen.go
+++ b/pkg/tcpip/transport/raw/raw_state_autogen.go
@@ -25,9 +25,11 @@ func (p *rawPacket) beforeSave() {}
 // +checklocksignore
 func (p *rawPacket) StateSave(stateSinkObject state.Sink) {
 	p.beforeSave()
-	var dataValue buffer.VectorisedView = p.saveData()
+	var dataValue buffer.VectorisedView
+	dataValue = p.saveData()
 	stateSinkObject.SaveValue(1, dataValue)
-	var receivedAtValue int64 = p.saveReceivedAt()
+	var receivedAtValue int64
+	receivedAtValue = p.saveReceivedAt()
 	stateSinkObject.SaveValue(2, receivedAtValue)
 	stateSinkObject.Save(0, &p.rawPacketEntry)
 	stateSinkObject.Save(3, &p.senderAddr)
diff --git a/pkg/tcpip/transport/tcp/tcp_state_autogen.go b/pkg/tcpip/transport/tcp/tcp_state_autogen.go
index 9c46d31d7..13061d2b1 100644
--- a/pkg/tcpip/transport/tcp/tcp_state_autogen.go
+++ b/pkg/tcpip/transport/tcp/tcp_state_autogen.go
@@ -135,7 +135,8 @@ func (a *accepted) beforeSave() {}
 // +checklocksignore
 func (a *accepted) StateSave(stateSinkObject state.Sink) {
 	a.beforeSave()
-	var endpointsValue []*endpoint = a.saveEndpoints()
+	var endpointsValue []*endpoint
+	endpointsValue = a.saveEndpoints()
 	stateSinkObject.SaveValue(0, endpointsValue)
 	stateSinkObject.Save(1, &a.cap)
 }
@@ -210,7 +211,8 @@ func (e *endpoint) StateFields() []string {
 // +checklocksignore
 func (e *endpoint) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
-	var stateValue EndpointState = e.saveState()
+	var stateValue EndpointState
+	stateValue = e.saveState()
 	stateSinkObject.SaveValue(10, stateValue)
 	stateSinkObject.Save(0, &e.TCPEndpointStateInner)
 	stateSinkObject.Save(1, &e.TransportEndpointInfo)
@@ -580,9 +582,11 @@ func (s *segment) beforeSave() {}
 // +checklocksignore
 func (s *segment) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
-	var dataValue buffer.VectorisedView = s.saveData()
+	var dataValue buffer.VectorisedView
+	dataValue = s.saveData()
 	stateSinkObject.SaveValue(8, dataValue)
-	var optionsValue []byte = s.saveOptions()
+	var optionsValue []byte
+	optionsValue = s.saveOptions()
 	stateSinkObject.SaveValue(17, optionsValue)
 	stateSinkObject.Save(0, &s.segmentEntry)
 	stateSinkObject.Save(1, &s.refCnt)
diff --git a/pkg/tcpip/transport/udp/udp_state_autogen.go b/pkg/tcpip/transport/udp/udp_state_autogen.go
index 6a3da67e2..fd87cf524 100644
--- a/pkg/tcpip/transport/udp/udp_state_autogen.go
+++ b/pkg/tcpip/transport/udp/udp_state_autogen.go
@@ -28,9 +28,11 @@ func (p *udpPacket) beforeSave() {}
 // +checklocksignore
 func (p *udpPacket) StateSave(stateSinkObject state.Sink) {
 	p.beforeSave()
-	var dataValue buffer.VectorisedView = p.saveData()
+	var dataValue buffer.VectorisedView
+	dataValue = p.saveData()
 	stateSinkObject.SaveValue(4, dataValue)
-	var receivedAtValue int64 = p.saveReceivedAt()
+	var receivedAtValue int64
+	receivedAtValue = p.saveReceivedAt()
 	stateSinkObject.SaveValue(5, receivedAtValue)
 	stateSinkObject.Save(0, &p.udpPacketEntry)
 	stateSinkObject.Save(1, &p.senderAddress)