From 230b933bd5bc9bbeeb60c167f6286cb062ee8bff Mon Sep 17 00:00:00 2001
From: Max Ng <maxgg@meta.com>
Date: Thu, 5 Dec 2024 22:04:46 -0800
Subject: [PATCH] Fix crash when processing MirrorOnDropDelta on non-DNX
 platforms

Summary: Fix crash from P1690876977

Reviewed By: nivinl

Differential Revision: D66735581

fbshipit-source-id: 9ab3ca42367c481d9546ec7750e499021baee4ca
---
 fboss/agent/hw/sai/switch/SaiManagerTable.cpp | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/fboss/agent/hw/sai/switch/SaiManagerTable.cpp b/fboss/agent/hw/sai/switch/SaiManagerTable.cpp
index 9dbc3900bb53d..7dfec2e5fdbbf 100644
--- a/fboss/agent/hw/sai/switch/SaiManagerTable.cpp
+++ b/fboss/agent/hw/sai/switch/SaiManagerTable.cpp
@@ -111,10 +111,7 @@ void SaiManagerTable::createSaiTableManagers(
   lagManager_ = std::make_unique<SaiLagManager>(
       saiStore, this, platform, concurrentIndices);
   wredManager_ = std::make_unique<SaiWredManager>(saiStore, this, platform);
-  // CSP CS00011823810
-#if !defined(BRCM_SAI_SDK_XGS_AND_DNX) || defined(BRCM_SAI_SDK_DNX_GTE_11_0)
   tamManager_ = std::make_unique<SaiTamManager>(saiStore, this, platform);
-#endif
   tunnelManager_ = std::make_unique<SaiTunnelManager>(saiStore, this, platform);
   teFlowEntryManager_ =
       std::make_unique<UnsupportedFeatureManager>("EM entries");
@@ -205,11 +202,7 @@ void SaiManagerTable::reset(bool skipSwitchManager) {
   }
   switchManager_->resetTamObject();
 #endif
-
-// CSP CS00011823810
-#if !defined(BRCM_SAI_SDK_XGS_AND_DNX) || defined(BRCM_SAI_SDK_DNX_GTE_11_0)
   tamManager_.reset();
-#endif
 
   // ports may be referenced in acls, reset ports after acls
   systemPortManager_.reset();