diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-02-18 19:45:53 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-02-18 19:45:53 +0000 |
| commit | 328bba2faa2fd9d18f0d2961f114cedcc960b662 (patch) | |
| tree | 42704a33a7d12be614c9972267fa5df9e250e085 | |
| parent | 191d459a1ded3e0e4a91141bf63487a99ffeeecd (diff) | |
| parent | bb5db80448c268f4d3eed932a01e78fcab7fb5d1 (diff) | |
Merge release-20210208.0-69-gbb5db8044 (automated)
| -rw-r--r-- | pkg/tcpip/stack/neighbor_cache.go | 4 | ||||
| -rw-r--r-- | pkg/tcpip/stack/neighbor_entry.go | 5 | ||||
| -rw-r--r-- | pkg/tcpip/stack/neighborstate_string.go | 7 |
3 files changed, 3 insertions, 13 deletions
diff --git a/pkg/tcpip/stack/neighbor_cache.go b/pkg/tcpip/stack/neighbor_cache.go index 533287c4c..6b1f8da86 100644 --- a/pkg/tcpip/stack/neighbor_cache.go +++ b/pkg/tcpip/stack/neighbor_cache.go @@ -25,10 +25,6 @@ const neighborCacheSize = 512 // max entries per interface // NeighborStats holds metrics for the neighbor table. type NeighborStats struct { - // FailedEntryLookups is deprecated; UnreachableEntryLookups should be used - // instead. - FailedEntryLookups *tcpip.StatCounter - // UnreachableEntryLookups counts the number of lookups performed on an // entry in Unreachable state. UnreachableEntryLookups *tcpip.StatCounter diff --git a/pkg/tcpip/stack/neighbor_entry.go b/pkg/tcpip/stack/neighbor_entry.go index 03fef52ee..36d3cad62 100644 --- a/pkg/tcpip/stack/neighbor_entry.go +++ b/pkg/tcpip/stack/neighbor_entry.go @@ -68,11 +68,6 @@ const ( // Static describes entries that have been explicitly added by the user. They // do not expire and are not deleted until explicitly removed. Static - // Failed is deprecated and should no longer be used. - // - // TODO(gvisor.dev/issue/4667): Remove this once all references to Failed - // are removed from Fuchsia. - Failed // Unreachable means reachability confirmation failed; the maximum number of // reachability probes has been sent and no replies have been received. // diff --git a/pkg/tcpip/stack/neighborstate_string.go b/pkg/tcpip/stack/neighborstate_string.go index 765df4d7a..cc5060e14 100644 --- a/pkg/tcpip/stack/neighborstate_string.go +++ b/pkg/tcpip/stack/neighborstate_string.go @@ -29,13 +29,12 @@ func _() { _ = x[Delay-4] _ = x[Probe-5] _ = x[Static-6] - _ = x[Failed-7] - _ = x[Unreachable-8] + _ = x[Unreachable-7] } -const _NeighborState_name = "UnknownIncompleteReachableStaleDelayProbeStaticFailedUnreachable" +const _NeighborState_name = "UnknownIncompleteReachableStaleDelayProbeStaticUnreachable" -var _NeighborState_index = [...]uint8{0, 7, 17, 26, 31, 36, 41, 47, 53, 64} +var _NeighborState_index = [...]uint8{0, 7, 17, 26, 31, 36, 41, 47, 58} func (i NeighborState) String() string { if i >= NeighborState(len(_NeighborState_index)-1) { |