diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-10-27 22:47:58 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-10-27 22:47:58 +0000 |
| commit | b6aec86b75a79678fc450cccb2a3b2d94fd84897 (patch) | |
| tree | dc121fdcaff96355bc5172568405c6e479bb8ff4 /pkg/tcpip/stack/neighbor_cache.go | |
| parent | 8544b68d9972c0878a719f932e8361ff4cb8d725 (diff) | |
| parent | 4d9066d1d763d7a1f3cedb3adcd4c16d12e23092 (diff) | |
Merge release-20201019.0-70-g4d9066d1d (automated)
Diffstat (limited to 'pkg/tcpip/stack/neighbor_cache.go')
| -rw-r--r-- | pkg/tcpip/stack/neighbor_cache.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkg/tcpip/stack/neighbor_cache.go b/pkg/tcpip/stack/neighbor_cache.go index 02882bf19..eebf43a1f 100644 --- a/pkg/tcpip/stack/neighbor_cache.go +++ b/pkg/tcpip/stack/neighbor_cache.go @@ -210,7 +210,7 @@ func (n *neighborCache) addStaticEntry(addr tcpip.Address, linkAddr tcpip.LinkAd } else { // Static entry found with the same address but different link address. entry.neigh.LinkAddr = linkAddr - entry.dispatchChangeEventLocked(entry.neigh.State) + entry.dispatchChangeEventLocked() entry.mu.Unlock() return } @@ -223,8 +223,7 @@ func (n *neighborCache) addStaticEntry(addr tcpip.Address, linkAddr tcpip.LinkAd entry.mu.Unlock() } - entry := newStaticNeighborEntry(n.nic, addr, linkAddr, n.state) - n.cache[addr] = entry + n.cache[addr] = newStaticNeighborEntry(n.nic, addr, linkAddr, n.state) } // removeEntryLocked removes the specified entry from the neighbor cache. |