Merge release-20210315.0-15-gacb4c6288 (automated)

3 files changed, 22 insertions, 0 deletions

diff --git a/pkg/tcpip/network/internal/fragmentation/fragmentation_state_autogen.go b/pkg/tcpip/network/internal/fragmentation/fragmentation_state_autogen.go
index 3f82c184a..21c5774e9 100644
--- a/pkg/tcpip/network/internal/fragmentation/fragmentation_state_autogen.go
+++ b/pkg/tcpip/network/internal/fragmentation/fragmentation_state_autogen.go
@@ -19,6 +19,7 @@ func (l *reassemblerList) StateFields() []string {
 
 func (l *reassemblerList) beforeSave() {}
 
+// +checklocksignore
 func (l *reassemblerList) StateSave(stateSinkObject state.Sink) {
 	l.beforeSave()
 	stateSinkObject.Save(0, &l.head)
@@ -27,6 +28,7 @@ func (l *reassemblerList) StateSave(stateSinkObject state.Sink) {
 
 func (l *reassemblerList) afterLoad() {}
 
+// +checklocksignore
 func (l *reassemblerList) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &l.head)
 	stateSourceObject.Load(1, &l.tail)
@@ -45,6 +47,7 @@ func (e *reassemblerEntry) StateFields() []string {
 
 func (e *reassemblerEntry) beforeSave() {}
 
+// +checklocksignore
 func (e *reassemblerEntry) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.next)
@@ -53,6 +56,7 @@ func (e *reassemblerEntry) StateSave(stateSinkObject state.Sink) {
 
 func (e *reassemblerEntry) afterLoad() {}
 
+// +checklocksignore
 func (e *reassemblerEntry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.next)
 	stateSourceObject.Load(1, &e.prev)
diff --git a/pkg/tcpip/network/ipv4/ipv4_state_autogen.go b/pkg/tcpip/network/ipv4/ipv4_state_autogen.go
index 87a48e2ce..19b672251 100644
--- a/pkg/tcpip/network/ipv4/ipv4_state_autogen.go
+++ b/pkg/tcpip/network/ipv4/ipv4_state_autogen.go
@@ -16,12 +16,14 @@ func (i *icmpv4DestinationUnreachableSockError) StateFields() []string {
 
 func (i *icmpv4DestinationUnreachableSockError) beforeSave() {}
 
+// +checklocksignore
 func (i *icmpv4DestinationUnreachableSockError) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 }
 
 func (i *icmpv4DestinationUnreachableSockError) afterLoad() {}
 
+// +checklocksignore
 func (i *icmpv4DestinationUnreachableSockError) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -37,6 +39,7 @@ func (i *icmpv4DestinationHostUnreachableSockError) StateFields() []string {
 
 func (i *icmpv4DestinationHostUnreachableSockError) beforeSave() {}
 
+// +checklocksignore
 func (i *icmpv4DestinationHostUnreachableSockError) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.icmpv4DestinationUnreachableSockError)
@@ -44,6 +47,7 @@ func (i *icmpv4DestinationHostUnreachableSockError) StateSave(stateSinkObject st
 
 func (i *icmpv4DestinationHostUnreachableSockError) afterLoad() {}
 
+// +checklocksignore
 func (i *icmpv4DestinationHostUnreachableSockError) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.icmpv4DestinationUnreachableSockError)
 }
@@ -60,6 +64,7 @@ func (i *icmpv4DestinationPortUnreachableSockError) StateFields() []string {
 
 func (i *icmpv4DestinationPortUnreachableSockError) beforeSave() {}
 
+// +checklocksignore
 func (i *icmpv4DestinationPortUnreachableSockError) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.icmpv4DestinationUnreachableSockError)
@@ -67,6 +72,7 @@ func (i *icmpv4DestinationPortUnreachableSockError) StateSave(stateSinkObject st
 
 func (i *icmpv4DestinationPortUnreachableSockError) afterLoad() {}
 
+// +checklocksignore
 func (i *icmpv4DestinationPortUnreachableSockError) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.icmpv4DestinationUnreachableSockError)
 }
@@ -84,6 +90,7 @@ func (e *icmpv4FragmentationNeededSockError) StateFields() []string {
 
 func (e *icmpv4FragmentationNeededSockError) beforeSave() {}
 
+// +checklocksignore
 func (e *icmpv4FragmentationNeededSockError) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.icmpv4DestinationUnreachableSockError)
@@ -92,6 +99,7 @@ func (e *icmpv4FragmentationNeededSockError) StateSave(stateSinkObject state.Sin
 
 func (e *icmpv4FragmentationNeededSockError) afterLoad() {}
 
+// +checklocksignore
 func (e *icmpv4FragmentationNeededSockError) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.icmpv4DestinationUnreachableSockError)
 	stateSourceObject.Load(1, &e.mtu)
diff --git a/pkg/tcpip/network/ipv6/ipv6_state_autogen.go b/pkg/tcpip/network/ipv6/ipv6_state_autogen.go
index 675fdc220..13d427822 100644
--- a/pkg/tcpip/network/ipv6/ipv6_state_autogen.go
+++ b/pkg/tcpip/network/ipv6/ipv6_state_autogen.go
@@ -16,12 +16,14 @@ func (i *icmpv6DestinationUnreachableSockError) StateFields() []string {
 
 func (i *icmpv6DestinationUnreachableSockError) beforeSave() {}
 
+// +checklocksignore
 func (i *icmpv6DestinationUnreachableSockError) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 }
 
 func (i *icmpv6DestinationUnreachableSockError) afterLoad() {}
 
+// +checklocksignore
 func (i *icmpv6DestinationUnreachableSockError) StateLoad(stateSourceObject state.Source) {
 }
 
@@ -37,6 +39,7 @@ func (i *icmpv6DestinationNetworkUnreachableSockError) StateFields() []string {
 
 func (i *icmpv6DestinationNetworkUnreachableSockError) beforeSave() {}
 
+// +checklocksignore
 func (i *icmpv6DestinationNetworkUnreachableSockError) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.icmpv6DestinationUnreachableSockError)
@@ -44,6 +47,7 @@ func (i *icmpv6DestinationNetworkUnreachableSockError) StateSave(stateSinkObject
 
 func (i *icmpv6DestinationNetworkUnreachableSockError) afterLoad() {}
 
+// +checklocksignore
 func (i *icmpv6DestinationNetworkUnreachableSockError) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.icmpv6DestinationUnreachableSockError)
 }
@@ -60,6 +64,7 @@ func (i *icmpv6DestinationPortUnreachableSockError) StateFields() []string {
 
 func (i *icmpv6DestinationPortUnreachableSockError) beforeSave() {}
 
+// +checklocksignore
 func (i *icmpv6DestinationPortUnreachableSockError) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.icmpv6DestinationUnreachableSockError)
@@ -67,6 +72,7 @@ func (i *icmpv6DestinationPortUnreachableSockError) StateSave(stateSinkObject st
 
 func (i *icmpv6DestinationPortUnreachableSockError) afterLoad() {}
 
+// +checklocksignore
 func (i *icmpv6DestinationPortUnreachableSockError) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.icmpv6DestinationUnreachableSockError)
 }
@@ -83,6 +89,7 @@ func (i *icmpv6DestinationAddressUnreachableSockError) StateFields() []string {
 
 func (i *icmpv6DestinationAddressUnreachableSockError) beforeSave() {}
 
+// +checklocksignore
 func (i *icmpv6DestinationAddressUnreachableSockError) StateSave(stateSinkObject state.Sink) {
 	i.beforeSave()
 	stateSinkObject.Save(0, &i.icmpv6DestinationUnreachableSockError)
@@ -90,6 +97,7 @@ func (i *icmpv6DestinationAddressUnreachableSockError) StateSave(stateSinkObject
 
 func (i *icmpv6DestinationAddressUnreachableSockError) afterLoad() {}
 
+// +checklocksignore
 func (i *icmpv6DestinationAddressUnreachableSockError) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &i.icmpv6DestinationUnreachableSockError)
 }
@@ -106,6 +114,7 @@ func (e *icmpv6PacketTooBigSockError) StateFields() []string {
 
 func (e *icmpv6PacketTooBigSockError) beforeSave() {}
 
+// +checklocksignore
 func (e *icmpv6PacketTooBigSockError) StateSave(stateSinkObject state.Sink) {
 	e.beforeSave()
 	stateSinkObject.Save(0, &e.mtu)
@@ -113,6 +122,7 @@ func (e *icmpv6PacketTooBigSockError) StateSave(stateSinkObject state.Sink) {
 
 func (e *icmpv6PacketTooBigSockError) afterLoad() {}
 
+// +checklocksignore
 func (e *icmpv6PacketTooBigSockError) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &e.mtu)
 }