diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-01-22 04:09:55 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-01-22 04:09:55 +0000 |
| commit | 159b86125bddc797946da5a9f0fa879aacdbc6d9 (patch) | |
| tree | 35c3930534f7bb7416d8978aa055c8e608a22ed2 /pkg/tcpip/stack/neighbor_entry.go | |
| parent | 3cb95a5af18b5d2194409ada447310ff283ca90b (diff) | |
| parent | 9f46328e1174be6b8b5442467050ad0b2f0b260f (diff) | |
Merge release-20210112.0-64-g9f46328e1 (automated)
Diffstat (limited to 'pkg/tcpip/stack/neighbor_entry.go')
| -rw-r--r-- | pkg/tcpip/stack/neighbor_entry.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkg/tcpip/stack/neighbor_entry.go b/pkg/tcpip/stack/neighbor_entry.go index 697132689..53ac9bb6e 100644 --- a/pkg/tcpip/stack/neighbor_entry.go +++ b/pkg/tcpip/stack/neighbor_entry.go @@ -96,7 +96,7 @@ type neighborEntry struct { done chan struct{} // onResolve is called with the result of address resolution. - onResolve []func(tcpip.LinkAddress, bool) + onResolve []func(LinkResolutionResult) isRouter bool job *tcpip.Job @@ -143,8 +143,9 @@ func newStaticNeighborEntry(nic *NIC, addr tcpip.Address, linkAddr tcpip.LinkAdd // // Precondition: e.mu MUST be locked. func (e *neighborEntry) notifyCompletionLocked(succeeded bool) { + res := LinkResolutionResult{LinkAddress: e.neigh.LinkAddr, Success: succeeded} for _, callback := range e.onResolve { - callback(e.neigh.LinkAddr, succeeded) + callback(res) } e.onResolve = nil if ch := e.done; ch != nil { |