summaryrefslogtreecommitdiffhomepage
path: root/pkg/tcpip/network
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-29 20:49:07 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-29 20:49:07 +0000
commitc4a484f2d0e800ed9949d91fb32a69542103d409 (patch)
treef176e08d1d3ad8208ce13b1c649741fcee2b0bcd /pkg/tcpip/network
parent34eb580e746eae4964d39cb0c677cd2fa5d31041 (diff)
parent1d88bce55e0c8ef77e31863d264b896493dce90f (diff)
Merge release-20200921.0-69-g1d88bce55 (automated)
Diffstat (limited to 'pkg/tcpip/network')
-rw-r--r--pkg/tcpip/network/ipv6/ipv6.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/tcpip/network/ipv6/ipv6.go b/pkg/tcpip/network/ipv6/ipv6.go
index 990e67210..e74160aa8 100644
--- a/pkg/tcpip/network/ipv6/ipv6.go
+++ b/pkg/tcpip/network/ipv6/ipv6.go
@@ -258,7 +258,7 @@ func (e *endpoint) Enable() *tcpip.Error {
}
// Do not auto-generate an IPv6 link-local address for loopback devices.
- if e.protocol.autoGenIPv6LinkLocal {
+ if e.protocol.autoGenIPv6LinkLocal && !e.nic.IsLoopback() {
// The valid and preferred lifetime is infinite for the auto-generated
// link-local address.
e.mu.ndp.doSLAAC(header.IPv6LinkLocalPrefix.Subnet(), header.NDPInfiniteLifetime, header.NDPInfiniteLifetime)