Merge release-20200127.0-85-g1b6a12a (automated)

21 files changed, 3 insertions, 20 deletions

diff --git a/pkg/tcpip/adapters/gonet/gonet_state_autogen.go b/pkg/tcpip/adapters/gonet/gonet_state_autogen.go
index 9b87956fd..7a5c5419e 100755
--- a/pkg/tcpip/adapters/gonet/gonet_state_autogen.go
+++ b/pkg/tcpip/adapters/gonet/gonet_state_autogen.go
@@ -1,4 +1,3 @@
 // automatically generated by stateify.
 
 package gonet
-
diff --git a/pkg/tcpip/hash/jenkins/jenkins_state_autogen.go b/pkg/tcpip/hash/jenkins/jenkins_state_autogen.go
index 310f0ee6d..216cc5a2e 100755
--- a/pkg/tcpip/hash/jenkins/jenkins_state_autogen.go
+++ b/pkg/tcpip/hash/jenkins/jenkins_state_autogen.go
@@ -1,4 +1,3 @@
 // automatically generated by stateify.
 
 package jenkins
-
diff --git a/pkg/tcpip/iptables/iptables_state_autogen.go b/pkg/tcpip/iptables/iptables_state_autogen.go
index f15092db2..e75169fa7 100755
--- a/pkg/tcpip/iptables/iptables_state_autogen.go
+++ b/pkg/tcpip/iptables/iptables_state_autogen.go
@@ -1,4 +1,3 @@
 // automatically generated by stateify.
 
 package iptables
-
diff --git a/pkg/tcpip/link/channel/channel_state_autogen.go b/pkg/tcpip/link/channel/channel_state_autogen.go
index 19e9e5a2b..24066fb83 100755
--- a/pkg/tcpip/link/channel/channel_state_autogen.go
+++ b/pkg/tcpip/link/channel/channel_state_autogen.go
@@ -1,4 +1,3 @@
 // automatically generated by stateify.
 
 package channel
-
diff --git a/pkg/tcpip/link/fdbased/fdbased_state_autogen.go b/pkg/tcpip/link/fdbased/fdbased_state_autogen.go
index ddc29cce5..97cb3958e 100755
--- a/pkg/tcpip/link/fdbased/fdbased_state_autogen.go
+++ b/pkg/tcpip/link/fdbased/fdbased_state_autogen.go
@@ -8,4 +8,3 @@
 // +build linux
 
 package fdbased
-
diff --git a/pkg/tcpip/link/loopback/loopback_state_autogen.go b/pkg/tcpip/link/loopback/loopback_state_autogen.go
index 87ec8cfc7..c00fd9f19 100755
--- a/pkg/tcpip/link/loopback/loopback_state_autogen.go
+++ b/pkg/tcpip/link/loopback/loopback_state_autogen.go
@@ -1,4 +1,3 @@
 // automatically generated by stateify.
 
 package loopback
-
diff --git a/pkg/tcpip/link/muxed/muxed_state_autogen.go b/pkg/tcpip/link/muxed/muxed_state_autogen.go
index e3330c0da..56330e2a5 100755
--- a/pkg/tcpip/link/muxed/muxed_state_autogen.go
+++ b/pkg/tcpip/link/muxed/muxed_state_autogen.go
@@ -1,4 +1,3 @@
 // automatically generated by stateify.
 
 package muxed
-
diff --git a/pkg/tcpip/link/rawfile/rawfile_state_autogen.go b/pkg/tcpip/link/rawfile/rawfile_state_autogen.go
index 943c408c1..6b6816bae 100755
--- a/pkg/tcpip/link/rawfile/rawfile_state_autogen.go
+++ b/pkg/tcpip/link/rawfile/rawfile_state_autogen.go
@@ -8,4 +8,3 @@
 // +build linux
 
 package rawfile
-
diff --git a/pkg/tcpip/link/sharedmem/pipe/pipe_state_autogen.go b/pkg/tcpip/link/sharedmem/pipe/pipe_state_autogen.go
index c7c7c21b3..d3b40feb4 100755
--- a/pkg/tcpip/link/sharedmem/pipe/pipe_state_autogen.go
+++ b/pkg/tcpip/link/sharedmem/pipe/pipe_state_autogen.go
@@ -1,4 +1,3 @@
 // automatically generated by stateify.
 
 package pipe
-
diff --git a/pkg/tcpip/link/sharedmem/queue/queue_state_autogen.go b/pkg/tcpip/link/sharedmem/queue/queue_state_autogen.go
index eec17d734..563d4fbb4 100755
--- a/pkg/tcpip/link/sharedmem/queue/queue_state_autogen.go
+++ b/pkg/tcpip/link/sharedmem/queue/queue_state_autogen.go
@@ -1,4 +1,3 @@
 // automatically generated by stateify.
 
 package queue
-
diff --git a/pkg/tcpip/link/sharedmem/sharedmem_state_autogen.go b/pkg/tcpip/link/sharedmem/sharedmem_state_autogen.go
index f739a1d50..bc12017b2 100755
--- a/pkg/tcpip/link/sharedmem/sharedmem_state_autogen.go
+++ b/pkg/tcpip/link/sharedmem/sharedmem_state_autogen.go
@@ -4,4 +4,3 @@
 // +build linux
 
 package sharedmem
-
diff --git a/pkg/tcpip/link/sniffer/sniffer_state_autogen.go b/pkg/tcpip/link/sniffer/sniffer_state_autogen.go
index cfd84a739..8d79defea 100755
--- a/pkg/tcpip/link/sniffer/sniffer_state_autogen.go
+++ b/pkg/tcpip/link/sniffer/sniffer_state_autogen.go
@@ -1,4 +1,3 @@
 // automatically generated by stateify.
 
 package sniffer
-
diff --git a/pkg/tcpip/link/tun/tun_state_autogen.go b/pkg/tcpip/link/tun/tun_state_autogen.go
index 277ed1b5f..149299ea3 100755
--- a/pkg/tcpip/link/tun/tun_state_autogen.go
+++ b/pkg/tcpip/link/tun/tun_state_autogen.go
@@ -3,4 +3,3 @@
 // +build linux
 
 package tun
-
diff --git a/pkg/tcpip/link/waitable/waitable_state_autogen.go b/pkg/tcpip/link/waitable/waitable_state_autogen.go
index 2029f4a1b..059424fa0 100755
--- a/pkg/tcpip/link/waitable/waitable_state_autogen.go
+++ b/pkg/tcpip/link/waitable/waitable_state_autogen.go
@@ -1,4 +1,3 @@
 // automatically generated by stateify.
 
 package waitable
-
diff --git a/pkg/tcpip/network/arp/arp_state_autogen.go b/pkg/tcpip/network/arp/arp_state_autogen.go
index 14a21baff..5cd8535e3 100755
--- a/pkg/tcpip/network/arp/arp_state_autogen.go
+++ b/pkg/tcpip/network/arp/arp_state_autogen.go
@@ -1,4 +1,3 @@
 // automatically generated by stateify.
 
 package arp
-
diff --git a/pkg/tcpip/network/hash/hash_state_autogen.go b/pkg/tcpip/network/hash/hash_state_autogen.go
index a3bcd4b69..9467fe298 100755
--- a/pkg/tcpip/network/hash/hash_state_autogen.go
+++ b/pkg/tcpip/network/hash/hash_state_autogen.go
@@ -1,4 +1,3 @@
 // automatically generated by stateify.
 
 package hash
-
diff --git a/pkg/tcpip/network/ipv4/ipv4_state_autogen.go b/pkg/tcpip/network/ipv4/ipv4_state_autogen.go
index 6b2cc0142..250b2128e 100755
--- a/pkg/tcpip/network/ipv4/ipv4_state_autogen.go
+++ b/pkg/tcpip/network/ipv4/ipv4_state_autogen.go
@@ -1,4 +1,3 @@
 // automatically generated by stateify.
 
 package ipv4
-
diff --git a/pkg/tcpip/network/ipv6/ipv6_state_autogen.go b/pkg/tcpip/network/ipv6/ipv6_state_autogen.go
index 53319e0c4..40c67d440 100755
--- a/pkg/tcpip/network/ipv6/ipv6_state_autogen.go
+++ b/pkg/tcpip/network/ipv6/ipv6_state_autogen.go
@@ -1,4 +1,3 @@
 // automatically generated by stateify.
 
 package ipv6
-
diff --git a/pkg/tcpip/seqnum/seqnum_state_autogen.go b/pkg/tcpip/seqnum/seqnum_state_autogen.go
index bf76f6ac4..23e79811d 100755
--- a/pkg/tcpip/seqnum/seqnum_state_autogen.go
+++ b/pkg/tcpip/seqnum/seqnum_state_autogen.go
@@ -1,4 +1,3 @@
 // automatically generated by stateify.
 
 package seqnum
-
diff --git a/pkg/tcpip/transport/tcp/endpoint.go b/pkg/tcpip/transport/tcp/endpoint.go
index e4a6b1b8b..f2be0e651 100644
--- a/pkg/tcpip/transport/tcp/endpoint.go
+++ b/pkg/tcpip/transport/tcp/endpoint.go
@@ -2166,6 +2166,9 @@ func (e *endpoint) listen(backlog int) *tcpip.Error {
 	e.isRegistered = true
 	e.setEndpointState(StateListen)
 
+	// The channel may be non-nil when we're restoring the endpoint, and it
+	// may be pre-populated with some previously accepted (but not Accepted)
+	// endpoints.
 	if e.acceptedChan == nil {
 		e.acceptedChan = make(chan *endpoint, backlog)
 	}
diff --git a/pkg/tcpip/transport/tcpconntrack/tcpconntrack_state_autogen.go b/pkg/tcpip/transport/tcpconntrack/tcpconntrack_state_autogen.go
index f3c60c272..ff53204da 100755
--- a/pkg/tcpip/transport/tcpconntrack/tcpconntrack_state_autogen.go
+++ b/pkg/tcpip/transport/tcpconntrack/tcpconntrack_state_autogen.go
@@ -1,4 +1,3 @@
 // automatically generated by stateify.
 
 package tcpconntrack
-