Merge release-20201117.0-88-g0c4973942 (automated)

This commit is contained in:
gVisor bot 2020-12-02 05:38:56 +00:00
commit c00b31f29b
1 changed files with 3 additions and 2 deletions

View File

@ -182,14 +182,15 @@ func (n *neighborCache) removeWaker(addr tcpip.Address, waker *sleep.Waker) {
// entries returns all entries in the neighbor cache.
func (n *neighborCache) entries() []NeighborEntry {
entries := make([]NeighborEntry, 0, len(n.cache))
n.mu.RLock()
defer n.mu.RUnlock()
entries := make([]NeighborEntry, 0, len(n.cache))
for _, entry := range n.cache {
entry.mu.RLock()
entries = append(entries, entry.neigh)
entry.mu.RUnlock()
}
n.mu.RUnlock()
return entries
}