diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-02-07 03:52:59 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-02-07 03:52:59 +0000 |
| commit | d3c84973c221343591d4b2e277735d85e83afa35 (patch) | |
| tree | 2ecdd3a425be66509f55f500aa6f448bfacddc48 /pkg/tcpip/stack | |
| parent | 73cfaa2e42c887482d62100f9253bc6eef53af64 (diff) | |
| parent | ca30dfa065f5458228b06dcf5379ed4edf29c165 (diff) | |
Merge release-20200127.0-96-gca30dfa (automated)
Diffstat (limited to 'pkg/tcpip/stack')
| -rwxr-xr-x | pkg/tcpip/stack/ndp.go | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pkg/tcpip/stack/ndp.go b/pkg/tcpip/stack/ndp.go index fae5f5014..045409bda 100755 --- a/pkg/tcpip/stack/ndp.go +++ b/pkg/tcpip/stack/ndp.go @@ -448,6 +448,13 @@ func (ndp *ndpState) startDuplicateAddressDetection(addr tcpip.Address, ref *ref remaining := ndp.configs.DupAddrDetectTransmits if remaining == 0 { ref.setKind(permanent) + + // Consider DAD to have resolved even if no DAD messages were actually + // transmitted. + if ndpDisp := ndp.nic.stack.ndpDisp; ndpDisp != nil { + ndpDisp.OnDuplicateAddressDetectionStatus(ndp.nic.ID(), addr, true, nil) + } + return nil } |