diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-05-05 16:54:13 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-05-05 16:54:13 +0000 |
| commit | 67ac8432a2088383fccb869ad859f149bd1c031e (patch) | |
| tree | 8882eb86c5c846f1a96565a62a2382c371a33bca /pkg/tcpip/network/ipv6/ipv6.go | |
| parent | 8aba2696b2b539001bb0dd33814e4671a535f7d5 (diff) | |
| parent | bf49a847abf30d508e2f229da780a16d09a042f8 (diff) | |
Merge release-20210419.0-69-gbf49a847a (automated)
Diffstat (limited to 'pkg/tcpip/network/ipv6/ipv6.go')
| -rw-r--r-- | pkg/tcpip/network/ipv6/ipv6.go | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/pkg/tcpip/network/ipv6/ipv6.go b/pkg/tcpip/network/ipv6/ipv6.go index f7510c243..6974eae11 100644 --- a/pkg/tcpip/network/ipv6/ipv6.go +++ b/pkg/tcpip/network/ipv6/ipv6.go @@ -420,11 +420,7 @@ func (e *endpoint) transitionForwarding(forwarding bool) { defer e.mu.Unlock() if forwarding { - // When transitioning into an IPv6 router, host-only state (NDP discovered - // routers, discovered on-link prefixes, and auto-generated addresses) is - // cleaned up/invalidated and NDP router solicitations are stopped. e.mu.ndp.stopSolicitingRouters() - e.mu.ndp.cleanupState(true /* hostOnly */) // As per RFC 4291 section 2.8: // @@ -613,7 +609,7 @@ func (e *endpoint) disableLocked() { return true }) - e.mu.ndp.cleanupState(false /* hostOnly */) + e.mu.ndp.cleanupState() // The endpoint may have already left the multicast group. switch err := e.leaveGroupLocked(header.IPv6AllNodesMulticastAddress).(type) { |