diff --git a/orchagent/muxorch.cpp b/orchagent/muxorch.cpp index 94a2e77b56..f82fa74965 100644 --- a/orchagent/muxorch.cpp +++ b/orchagent/muxorch.cpp @@ -855,13 +855,6 @@ bool MuxNbrHandler::disable(sai_object_id_t tnh) return false; } - neigh = NeighborEntry(it->first, alias_); - if (!gNeighOrch->disableNeighbor(neigh)) - { - SWSS_LOG_INFO("Disabling neigh failed for %s", neigh.ip_address.to_string().c_str()); - return false; - } - updateTunnelRoute(nh_key, true); IpPrefix pfx = it->first.to_string(); @@ -870,6 +863,13 @@ bool MuxNbrHandler::disable(sai_object_id_t tnh) return false; } + neigh = NeighborEntry(it->first, alias_); + if (!gNeighOrch->disableNeighbor(neigh)) + { + SWSS_LOG_INFO("Disabling neigh failed for %s", neigh.ip_address.to_string().c_str()); + return false; + } + it++; }