diff options
author | gVisor bot <gvisor-bot@google.com> | 2021-01-16 03:05:57 +0000 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2021-01-16 03:05:57 +0000 |
commit | 4d0fcb53e5a0dd280de04b5057b659d8e9a253a6 (patch) | |
tree | 83beeb586189f4f04e184659508670fbd16c9a95 /pkg/tcpip/stack/linkaddrcache.go | |
parent | 1a5ad08a03f35c80f1ed18d7775e6322d8ba80ca (diff) | |
parent | cd75bb163f46bbe238945b98d50c7b33e60d4490 (diff) |
Merge release-20210112.0-40-gcd75bb163 (automated)
Diffstat (limited to 'pkg/tcpip/stack/linkaddrcache.go')
-rw-r--r-- | pkg/tcpip/stack/linkaddrcache.go | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/pkg/tcpip/stack/linkaddrcache.go b/pkg/tcpip/stack/linkaddrcache.go index 792f4f170..b600a1cab 100644 --- a/pkg/tcpip/stack/linkaddrcache.go +++ b/pkg/tcpip/stack/linkaddrcache.go @@ -182,15 +182,6 @@ func (c *linkAddrCache) getOrCreateEntryLocked(k tcpip.FullAddress) *linkAddrEnt // get reports any known link address for k. func (c *linkAddrCache) get(k tcpip.FullAddress, linkRes LinkAddressResolver, localAddr tcpip.Address, nic NetworkInterface, onResolve func(tcpip.LinkAddress, bool)) (tcpip.LinkAddress, <-chan struct{}, *tcpip.Error) { - if linkRes != nil { - if addr, ok := linkRes.ResolveStaticAddress(k.Addr); ok { - if onResolve != nil { - onResolve(addr, true) - } - return addr, nil, nil - } - } - c.cache.Lock() defer c.cache.Unlock() entry := c.getOrCreateEntryLocked(k) |