diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-01-30 19:52:10 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-01-30 19:52:10 +0000 |
| commit | 7c8ffc52768a200be774dbff66db2d19983b42a8 (patch) | |
| tree | fee38360f89766d6ee61fb1e5e654dceaecfab37 /pkg/tcpip/stack/neighbor_entry.go | |
| parent | fc39bebe486d7bef4b2aaea5f615069f508d5c46 (diff) | |
| parent | 2d90bc54809766927e6028fac5b9f67cd2a13c3e (diff) | |
Merge release-20210125.0-37-g2d90bc548 (automated)
Diffstat (limited to 'pkg/tcpip/stack/neighbor_entry.go')
| -rw-r--r-- | pkg/tcpip/stack/neighbor_entry.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/tcpip/stack/neighbor_entry.go b/pkg/tcpip/stack/neighbor_entry.go index 53ac9bb6e..a037ca6f9 100644 --- a/pkg/tcpip/stack/neighbor_entry.go +++ b/pkg/tcpip/stack/neighbor_entry.go @@ -254,7 +254,7 @@ func (e *neighborEntry) setStateLocked(next NeighborState) { return } - if err := e.linkRes.LinkAddressRequest(e.neigh.Addr, "" /* localAddr */, e.neigh.LinkAddr, e.nic); err != nil { + if err := e.linkRes.LinkAddressRequest(e.neigh.Addr, "" /* localAddr */, e.neigh.LinkAddr); err != nil { e.dispatchRemoveEventLocked() e.setStateLocked(Failed) return @@ -340,7 +340,7 @@ func (e *neighborEntry) handlePacketQueuedLocked(localAddr tcpip.Address) { // address SHOULD be placed in the IP Source Address of the outgoing // solicitation. // - if err := e.linkRes.LinkAddressRequest(e.neigh.Addr, localAddr, "", e.nic); err != nil { + if err := e.linkRes.LinkAddressRequest(e.neigh.Addr, localAddr, ""); err != nil { // There is no need to log the error here; the NUD implementation may // assume a working link. A valid link should be the responsibility of // the NIC/stack.LinkEndpoint. |