diff --git a/orchagent/muxorch.cpp b/orchagent/muxorch.cpp index 7f6363319d..9764ce01b5 100644 --- a/orchagent/muxorch.cpp +++ b/orchagent/muxorch.cpp @@ -786,13 +786,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(); @@ -801,6 +794,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++; }